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 19f68661a56c96f7a74af1f95a5dbf8f20a467b9..a93b72cf611cfc4dfa6283b8bd249c02db52ca19 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -4,49 +4,60 @@ package main
 // LoggingResponseWriter
 
 import (
-  "bytes"
-       "github.com/gorilla/mux"
        "log"
        "net/http"
+       "strings"
+       "time"
 )
 
+// LoggingResponseWriter has anonymous fields ResponseWriter and ResponseBody
 type LoggingResponseWriter struct {
-  Status int
-  Data *bytes.Buffer
-  http.ResponseWriter
+       Status int
+       Length int
+       http.ResponseWriter
+       ResponseBody string
+       sentHdr      time.Time
 }
 
+// WriteHeader writes header to ResponseWriter
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
-  loggingWriter.Status = code
-  loggingWriter.ResponseWriter.WriteHeader(code)
+       if loggingWriter.sentHdr == zeroTime {
+               loggingWriter.sentHdr = time.Now()
+       }
+       loggingWriter.Status = code
+       loggingWriter.ResponseWriter.WriteHeader(code)
 }
 
-func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
-  loggingWriter.Data.Write(data)
-  return loggingWriter.ResponseWriter.Write(data)
+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)
+       }
+       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) {
-  loggingWriter := LoggingResponseWriter{200, bytes.NewBuffer(make([]byte, 0, 0)), resp}
-  loggingRouter.router.ServeHTTP(&loggingWriter, req)
-  if loggingWriter.Status == 200 {
-    if loggingWriter.Data.Len() > 200 {  // could be large block, so just print the size
-      log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:],
-          loggingWriter.Status, loggingWriter.Data.Len())
-    } else {  // this could be a hash or status or a small block etc
-      log.Printf("[%s] %s %s %d %s", req.RemoteAddr, req.Method, req.URL.Path[1:],
-          loggingWriter.Status, loggingWriter.Data)
-    }
-  } else {
-    log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
-  }
+       t0 := time.Now()
+       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)
+       }
+       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)
+
 }