Merge branch 'master' into 5538-close-idle-connections

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

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 19f68661a56c96f7a74af1f95a5dbf8f20a467b9..47bb6d77179f226dc20d84a525fa5a0de3a5f7af 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -4,49 +4,54 @@ 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
 }
 
+// WriteHeader writes header to ResponseWriter
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
-  loggingWriter.Status = code
-  loggingWriter.ResponseWriter.WriteHeader(code)
+       loggingWriter.Status = code
+       loggingWriter.ResponseWriter.WriteHeader(code)
 }
 
-func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
-  loggingWriter.Data.Write(data)
-  return loggingWriter.ResponseWriter.Write(data)
+func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
+       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
+       router *mux.Router
 }
 
-func MakeLoggingRESTRouter() (*LoggingRESTRouter) {
-  router := MakeRESTRouter()
-  return (&LoggingRESTRouter{router})
+// MakeLoggingRESTRouter initializes LoggingRESTRouter
+func MakeLoggingRESTRouter() *LoggingRESTRouter {
+       router := MakeRESTRouter()
+       return (&LoggingRESTRouter{router})
 }
 
 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, ""}
+       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)
+
 }