projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13619: Move configuration options to arvados.Cluster.RequestLimits
[arvados.git]
/
sdk
/
go
/
httpserver
/
logger.go
diff --git
a/sdk/go/httpserver/logger.go
b/sdk/go/httpserver/logger.go
index ec3fa7fae18dc6b88022b95771efc1de83f96107..9577718c76e45c1757297d5272c6174f5a454571 100644
(file)
--- a/
sdk/go/httpserver/logger.go
+++ b/
sdk/go/httpserver/logger.go
@@
-17,7
+17,10
@@
type contextKey struct {
name string
}
name string
}
-var requestTimeContextKey = contextKey{"requestTime"}
+var (
+ requestTimeContextKey = contextKey{"requestTime"}
+ loggerContextKey = contextKey{"logger"}
+)
// LogRequests wraps an http.Handler, logging each request and
// response via logger.
// LogRequests wraps an http.Handler, logging each request and
// response via logger.
@@
-27,7
+30,6
@@
func LogRequests(logger logrus.FieldLogger, h http.Handler) http.Handler {
}
return http.HandlerFunc(func(wrapped http.ResponseWriter, req *http.Request) {
w := &responseTimer{ResponseWriter: WrapResponseWriter(wrapped)}
}
return http.HandlerFunc(func(wrapped http.ResponseWriter, req *http.Request) {
w := &responseTimer{ResponseWriter: WrapResponseWriter(wrapped)}
- req = req.WithContext(context.WithValue(req.Context(), &requestTimeContextKey, time.Now()))
lgr := logger.WithFields(logrus.Fields{
"RequestID": req.Header.Get("X-Request-Id"),
"remoteAddr": req.RemoteAddr,
lgr := logger.WithFields(logrus.Fields{
"RequestID": req.Header.Get("X-Request-Id"),
"remoteAddr": req.RemoteAddr,
@@
-38,12
+40,25
@@
func LogRequests(logger logrus.FieldLogger, h http.Handler) http.Handler {
"reqQuery": req.URL.RawQuery,
"reqBytes": req.ContentLength,
})
"reqQuery": req.URL.RawQuery,
"reqBytes": req.ContentLength,
})
+ ctx := req.Context()
+ ctx = context.WithValue(ctx, &requestTimeContextKey, time.Now())
+ ctx = context.WithValue(ctx, &loggerContextKey, lgr)
+ req = req.WithContext(ctx)
+
logRequest(w, req, lgr)
defer logResponse(w, req, lgr)
h.ServeHTTP(w, req)
})
}
logRequest(w, req, lgr)
defer logResponse(w, req, lgr)
h.ServeHTTP(w, req)
})
}
+func Logger(req *http.Request) logrus.FieldLogger {
+ if lgr, ok := req.Context().Value(&loggerContextKey).(logrus.FieldLogger); ok {
+ return lgr
+ } else {
+ return logrus.StandardLogger()
+ }
+}
+
func logRequest(w *responseTimer, req *http.Request, lgr *logrus.Entry) {
lgr.Info("request")
}
func logRequest(w *responseTimer, req *http.Request, lgr *logrus.Entry) {
lgr.Info("request")
}