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

Split endpoint and path in WFE+WFE2 web.RequestEvent (#3683)

This commit is contained in:
Roland Bracewell Shoemaker 2018-05-02 10:20:21 -07:00 committed by Jacob Hoffman-Andrews
parent d01f74402b
commit c3669f9068
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/context.go
View File

@ -14,6 +14,7 @@ import (
type RequestEvent struct { type RequestEvent struct {
RealIP string `json:",omitempty"` RealIP string `json:",omitempty"`
Endpoint string `json:",omitempty"` Endpoint string `json:",omitempty"`
Slug string `json:",omitempty"`
Method string `json:",omitempty"` Method string `json:",omitempty"`
Errors []string `json:",omitempty"` Errors []string `json:",omitempty"`
Requester int64 `json:",omitempty"` Requester int64 `json:",omitempty"`

3
wfe/wfe.go
View File

@ -11,7 +11,6 @@ import (
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
"path"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
@ -175,7 +174,7 @@ func (wfe *WebFrontEndImpl) HandleFunc(mux *http.ServeMux, pattern string, h web
logEvent.Endpoint = pattern logEvent.Endpoint = pattern
if request.URL != nil { if request.URL != nil {
logEvent.Endpoint = path.Join(logEvent.Endpoint, request.URL.Path) logEvent.Slug = request.URL.Path
} }
switch request.Method { switch request.Method {

3
wfe2/wfe.go
View File

@ -9,7 +9,6 @@ import (
"fmt" "fmt"
"net" "net"
"net/http" "net/http"
"path"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
@ -175,7 +174,7 @@ func (wfe *WebFrontEndImpl) HandleFunc(mux *http.ServeMux, pattern string, h web
logEvent.Endpoint = pattern logEvent.Endpoint = pattern
if request.URL != nil { if request.URL != nil {
logEvent.Endpoint = path.Join(logEvent.Endpoint, request.URL.Path) logEvent.Slug = request.URL.Path
} }
switch request.Method { switch request.Method {