Merge branch '8998-optimize-decode-www-form-component' closes #8998

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

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index b622d1d3eefd2eb3bedfb5e4260976cb2075f85a..a93b72cf611cfc4dfa6283b8bd249c02db52ca19 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -4,26 +4,36 @@ package main
 // LoggingResponseWriter
 
 import (
-       "github.com/gorilla/mux"
        "log"
        "net/http"
        "strings"
        "time"
 )
 
+// LoggingResponseWriter has anonymous fields ResponseWriter and ResponseBody
 type LoggingResponseWriter struct {
        Status int
        Length int
        http.ResponseWriter
        ResponseBody string
+       sentHdr      time.Time
 }
 
+// WriteHeader writes header to ResponseWriter
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
+       if loggingWriter.sentHdr == zeroTime {
+               loggingWriter.sentHdr = time.Now()
+       }
        loggingWriter.Status = code
        loggingWriter.ResponseWriter.WriteHeader(code)
 }
 
+var zeroTime time.Time
+
 func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
+       if loggingWriter.Length == 0 && len(data) > 0 && loggingWriter.sentHdr == zeroTime {
+               loggingWriter.sentHdr = time.Now()
+       }
        loggingWriter.Length += len(data)
        if loggingWriter.Status >= 400 {
                loggingWriter.ResponseBody += string(data)
@@ -31,23 +41,23 @@ func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
        return loggingWriter.ResponseWriter.Write(data)
 }
 
+// LoggingRESTRouter is used to add logging capabilities to mux.Router
 type LoggingRESTRouter struct {
-       router *mux.Router
-}
-
-func MakeLoggingRESTRouter() *LoggingRESTRouter {
-       router := MakeRESTRouter()
-       return (&LoggingRESTRouter{router})
+       router http.Handler
 }
 
 func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
        t0 := time.Now()
-       loggingWriter := LoggingResponseWriter{http.StatusOK, 0, resp, ""}
+       loggingWriter := LoggingResponseWriter{http.StatusOK, 0, resp, "", zeroTime}
        loggingRouter.router.ServeHTTP(&loggingWriter, req)
        statusText := http.StatusText(loggingWriter.Status)
        if loggingWriter.Status >= 400 {
                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)
+       now := time.Now()
+       tTotal := now.Sub(t0)
+       tLatency := loggingWriter.sentHdr.Sub(t0)
+       tResponse := now.Sub(loggingWriter.sentHdr)
+       log.Printf("[%s] %s %s %d %.6fs %.6fs %.6fs %d %d \"%s\"", req.RemoteAddr, req.Method, req.URL.Path[1:], req.ContentLength, tTotal.Seconds(), tLatency.Seconds(), tResponse.Seconds(), loggingWriter.Status, loggingWriter.Length, statusText)
 
 }