Merge branch 'master' into 3762-delete-list-worker

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

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 6927019fd917ad69b90f8367ce81a2dce96e8251..e30df876322ab9c09acdbab110f851ea0a954e20 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -7,12 +7,14 @@ import (
        "github.com/gorilla/mux"
        "log"
        "net/http"
+       "strings"
 )
 
 type LoggingResponseWriter struct {
        Status int
        Length int
        http.ResponseWriter
+       ResponseBody string
 }
 
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
@@ -21,7 +23,10 @@ func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
 }
 
 func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
-       loggingWriter.Length = len(data)
+       loggingWriter.Length += len(data)
+       if loggingWriter.Status >= 400 {
+               loggingWriter.ResponseBody += string(data)
+       }
        return loggingWriter.ResponseWriter.Write(data)
 }
 
@@ -35,11 +40,12 @@ func MakeLoggingRESTRouter() *LoggingRESTRouter {
 }
 
 func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
-       loggingWriter := LoggingResponseWriter{200, 0, resp}
+       loggingWriter := LoggingResponseWriter{200, 0, resp, ""}
        loggingRouter.router.ServeHTTP(&loggingWriter, req)
-       if loggingWriter.Status == 200 {
-               log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
-       } else {
-               log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
+       statusText := "OK"
+       if loggingWriter.Status >= 400 {
+               statusText = strings.Replace(loggingWriter.ResponseBody, "\n", "", -1)
        }
+       log.Printf("[%s] %s %s %d %d \"%s\"", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length, statusText)
+
 }