Merge branch 'master' into 6663-git-server

[arvados.git] / services / keepstore / logging_router.go

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index d9dfc35739f988281300784a04ed8fd7abb9fc71..b622d1d3eefd2eb3bedfb5e4260976cb2075f85a 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -8,13 +8,14 @@ import (
        "log"
        "net/http"
        "strings"
+       "time"
 )
 
 type LoggingResponseWriter struct {
        Status int
        Length int
        http.ResponseWriter
-       Response string
+       ResponseBody string
 }
 
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
@@ -25,7 +26,7 @@ func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
 func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
        loggingWriter.Length += len(data)
        if loggingWriter.Status >= 400 {
-               loggingWriter.Response += string(data)
+               loggingWriter.ResponseBody += string(data)
        }
        return loggingWriter.ResponseWriter.Write(data)
 }
@@ -40,11 +41,13 @@ func MakeLoggingRESTRouter() *LoggingRESTRouter {
 }
 
 func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
-       loggingWriter := LoggingResponseWriter{200, 0, resp, ""}
+       t0 := time.Now()
+       loggingWriter := LoggingResponseWriter{http.StatusOK, 0, resp, ""}
        loggingRouter.router.ServeHTTP(&loggingWriter, req)
+       statusText := http.StatusText(loggingWriter.Status)
        if loggingWriter.Status >= 400 {
-               log.Printf("[%s] %s %s %d %d \"%s\"", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length, strings.TrimSpace(loggingWriter.Response))
-       } else {
-               log.Printf("[%s] %s %s %d %d \"OK\"", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
+               statusText = strings.Replace(loggingWriter.ResponseBody, "\n", "", -1)
        }
+       log.Printf("[%s] %s %s %.6fs %d %d \"%s\"", req.RemoteAddr, req.Method, req.URL.Path[1:], time.Since(t0).Seconds(), loggingWriter.Status, loggingWriter.Length, statusText)
+
 }