Merge pull request #609 from RichardScothern/single-log-line
Log a single line when a response completes.
This commit is contained in:
commit
9038e48c3b
1 changed files with 8 additions and 4 deletions
|
@ -362,8 +362,12 @@ func (app *App) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
// Instantiate an http context here so we can track the error codes
|
// Instantiate an http context here so we can track the error codes
|
||||||
// returned by the request router.
|
// returned by the request router.
|
||||||
ctx := defaultContextManager.context(app, w, r)
|
ctx := defaultContextManager.context(app, w, r)
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
ctxu.GetResponseLogger(ctx).Infof("response completed")
|
status, ok := ctx.Value("http.response.status").(int)
|
||||||
|
if ok && status >= 200 && status <= 399 {
|
||||||
|
ctxu.GetResponseLogger(ctx).Infof("response completed")
|
||||||
|
}
|
||||||
}()
|
}()
|
||||||
defer defaultContextManager.release(ctx)
|
defer defaultContextManager.release(ctx)
|
||||||
|
|
||||||
|
@ -443,11 +447,11 @@ func (app *App) dispatcher(dispatch dispatchFunc) http.Handler {
|
||||||
// own errors if they need different behavior (such as range errors
|
// own errors if they need different behavior (such as range errors
|
||||||
// for layer upload).
|
// for layer upload).
|
||||||
if context.Errors.Len() > 0 {
|
if context.Errors.Len() > 0 {
|
||||||
app.logError(context, context.Errors)
|
|
||||||
|
|
||||||
if err := errcode.ServeJSON(w, context.Errors); err != nil {
|
if err := errcode.ServeJSON(w, context.Errors); err != nil {
|
||||||
ctxu.GetLogger(context).Errorf("error serving error json: %v (from %v)", err, context.Errors)
|
ctxu.GetLogger(context).Errorf("error serving error json: %v (from %v)", err, context.Errors)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
app.logError(context, context.Errors)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -476,7 +480,7 @@ func (app *App) logError(context context.Context, errors errcode.Errors) {
|
||||||
"err.code",
|
"err.code",
|
||||||
"err.message",
|
"err.message",
|
||||||
"err.detail"))
|
"err.detail"))
|
||||||
ctxu.GetLogger(c).Errorf("An error occured")
|
ctxu.GetResponseLogger(c).Errorf("response completed with error")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue