10383: Merge branch 'master' into 10383-arv-put-incremental-upload

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

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 19f68661a56c96f7a74af1f95a5dbf8f20a467b9..0f556b538ac7ae15b1939f61bad13be3ed0404e5 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -4,49 +4,74 @@ 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
 }
 
-func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
-  loggingWriter.Status = code
-  loggingWriter.ResponseWriter.WriteHeader(code)
+// CloseNotify implements http.CloseNotifier.
+func (resp *LoggingResponseWriter) CloseNotify() <-chan bool {
+       wrapped, ok := resp.ResponseWriter.(http.CloseNotifier)
+       if !ok {
+               // If upstream doesn't implement CloseNotifier, we can
+               // satisfy the interface by returning a channel that
+               // never sends anything (the interface doesn't
+               // guarantee that anything will ever be sent on the
+               // channel even if the client disconnects).
+               return nil
+       }
+       return wrapped.CloseNotify()
 }
 
-func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
-  loggingWriter.Data.Write(data)
-  return loggingWriter.ResponseWriter.Write(data)
+// WriteHeader writes header to ResponseWriter
+func (resp *LoggingResponseWriter) WriteHeader(code int) {
+       if resp.sentHdr == zeroTime {
+               resp.sentHdr = time.Now()
+       }
+       resp.Status = code
+       resp.ResponseWriter.WriteHeader(code)
 }
 
-type LoggingRESTRouter struct {
-  router *mux.Router
+var zeroTime time.Time
+
+func (resp *LoggingResponseWriter) Write(data []byte) (int, error) {
+       if resp.Length == 0 && len(data) > 0 && resp.sentHdr == zeroTime {
+               resp.sentHdr = time.Now()
+       }
+       resp.Length += len(data)
+       if resp.Status >= 400 {
+               resp.ResponseBody += string(data)
+       }
+       return resp.ResponseWriter.Write(data)
 }
 
-func MakeLoggingRESTRouter() (*LoggingRESTRouter) {
-  router := MakeRESTRouter()
-  return (&LoggingRESTRouter{router})
+// LoggingRESTRouter is used to add logging capabilities to mux.Router
+type LoggingRESTRouter struct {
+       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)
-  }
+func (loggingRouter *LoggingRESTRouter) ServeHTTP(wrappedResp http.ResponseWriter, req *http.Request) {
+       t0 := time.Now()
+       resp := LoggingResponseWriter{http.StatusOK, 0, wrappedResp, "", zeroTime}
+       loggingRouter.router.ServeHTTP(&resp, req)
+       statusText := http.StatusText(resp.Status)
+       if resp.Status >= 400 {
+               statusText = strings.Replace(resp.ResponseBody, "\n", "", -1)
+       }
+       now := time.Now()
+       tTotal := now.Sub(t0)
+       tLatency := resp.sentHdr.Sub(t0)
+       tResponse := now.Sub(resp.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(), resp.Status, resp.Length, statusText)
+
 }