X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/960e574bc6c559e67c12fc6ac844dd7aa6880051..7327d3b601a50148abead0ae226176a40937e363:/services/keepstore/logging_router.go

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 0598d4cb0c..b622d1d3ee 100644
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -8,13 +8,14 @@ import (
 	"log"
 	"net/http"
 	"strings"
+	"time"
 )
 
 type LoggingResponseWriter struct {
 	Status int
 	Length int
 	http.ResponseWriter
-	Response string
+	ResponseBody string
 }
 
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
@@ -25,7 +26,7 @@ func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
 func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
 	loggingWriter.Length += len(data)
 	if loggingWriter.Status >= 400 {
-		loggingWriter.Response += string(data)
+		loggingWriter.ResponseBody += string(data)
 	}
 	return loggingWriter.ResponseWriter.Write(data)
 }
@@ -40,11 +41,13 @@ func MakeLoggingRESTRouter() *LoggingRESTRouter {
 }
 
 func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
-	loggingWriter := LoggingResponseWriter{200, 0, resp, ""}
+	t0 := time.Now()
+	loggingWriter := LoggingResponseWriter{http.StatusOK, 0, resp, ""}
 	loggingRouter.router.ServeHTTP(&loggingWriter, req)
+	statusText := http.StatusText(loggingWriter.Status)
 	if loggingWriter.Status >= 400 {
-		log.Printf("[%s] %s %s %d %d '%s'", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length, strings.TrimSpace(loggingWriter.Response))
-	} else {
-		log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
+		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)
+
 }