letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove RequestTime and ResponseTime from WFE log (#2708) 

Fixes #2707.
This commit is contained in:
Jacob Hoffman-Andrews 2017-04-27 14:55:31 -07:00 committed by GitHub
parent 0282f9f48e
commit 8e80a22493
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wfe/context.go
View File

@ -4,7 +4,6 @@ import (
"encoding/json"
"fmt"
"net/http"
"time"
"golang.org/x/net/context"
@ -14,13 +13,11 @@ import (
)
type requestEvent struct {
ID string `json:",omitempty"`
RealIP string `json:",omitempty"`
ClientAddr string `json:",omitempty"`
Endpoint string `json:",omitempty"`
Method string `json:",omitempty"`
RequestTime time.Time `json:",omitempty"`
ResponseTime time.Time `json:",omitempty"`
ID string `json:",omitempty"`
RealIP string `json:",omitempty"`
ClientAddr string `json:",omitempty"`
Endpoint string `json:",omitempty"`
Method string `json:",omitempty"`
Errors []string
Requester int64 `json:",omitempty"`
Contacts *[]string `json:",omitempty"`
@ -54,13 +51,12 @@ type topHandler struct {
func (th *topHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
logEvent := &requestEvent{
ID: core.NewToken(),
RealIP: r.Header.Get("X-Real-IP"),
ClientAddr: getClientAddr(r),
Method: r.Method,
RequestTime: time.Now(),
UserAgent: r.Header.Get("User-Agent"),
Extra: make(map[string]interface{}, 0),
ID: core.NewToken(),
RealIP: r.Header.Get("X-Real-IP"),
ClientAddr: getClientAddr(r),
Method: r.Method,
UserAgent: r.Header.Get("User-Agent"),
Extra: make(map[string]interface{}, 0),
}
w.Header().Set("Boulder-Request-ID", logEvent.ID)
defer th.logEvent(logEvent)
@ -69,7 +65,6 @@ func (th *topHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func (th *topHandler) logEvent(logEvent *requestEvent) {
logEvent.ResponseTime = th.clk.Now()
var msg string
if len(logEvent.Errors) != 0 {
msg = "Terminated request"