diff --git a/web/context.go b/web/context.go index 52b1efc08..832bfb7ca 100644 --- a/web/context.go +++ b/web/context.go @@ -17,12 +17,12 @@ type RequestEvent struct { // whitespace-separated ahead of the JSON. This saves bytes in the logs since // we don't have to include field names, quotes, or commas -- all of these // fields are known to not include whitespace. - Method string `json:"-,omitempty"` - Endpoint string `json:"-,omitempty"` - Requester int64 `json:"-,omitempty"` - Code int `json:"-,omitempty"` - Latency float64 `json:"-,omitempty"` - RealIP string `json:"-,omitempty"` + Method string `json:"-"` + Endpoint string `json:"-"` + Requester int64 `json:"-"` + Code int `json:"-"` + Latency float64 `json:"-"` + RealIP string `json:"-"` Slug string `json:",omitempty"` InternalErrors []string `json:",omitempty"` diff --git a/wfe2/wfe.go b/wfe2/wfe.go index 1bbf2322b..7eeec3585 100644 --- a/wfe2/wfe.go +++ b/wfe2/wfe.go @@ -860,8 +860,10 @@ func (wfe *WebFrontEndImpl) Challenge( challenge := authz.Challenges[challengeIndex] logEvent.Extra["ChallengeType"] = challenge.Type - logEvent.Extra["Identifier"] = authz.Identifier - logEvent.Extra["AuthorizationStatus"] = authz.Status + if authz.Identifier.Type == core.IdentifierDNS { + logEvent.DNSName = authz.Identifier.Value + } + logEvent.Status = string(authz.Status) switch request.Method { case "GET", "HEAD": @@ -1244,8 +1246,10 @@ func (wfe *WebFrontEndImpl) Authorization(ctx context.Context, logEvent *web.Req } return } - logEvent.Extra["Identifier"] = authz.Identifier - logEvent.Extra["AuthorizationStatus"] = authz.Status + if authz.Identifier.Type == core.IdentifierDNS { + logEvent.DNSName = authz.Identifier.Value + } + logEvent.Status = string(authz.Status) // After expiring, authorizations are inaccessible if authz.Expires == nil || authz.Expires.Before(wfe.clk.Now()) {