X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f69395a08509cc8c664c3256019d4d3cdb67db86..a4211acb465bd42869bf2a2f9fad6ff2c5e518e0:/services/keepstore/logging_router.go

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index d9dfc35739..e30df87632 100644
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -14,7 +14,7 @@ type LoggingResponseWriter struct {
 	Status int
 	Length int
 	http.ResponseWriter
-	Response string
+	ResponseBody string
 }
 
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
@@ -25,7 +25,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)
 }
@@ -42,9 +42,10 @@ func MakeLoggingRESTRouter() *LoggingRESTRouter {
 func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	loggingWriter := LoggingResponseWriter{200, 0, resp, ""}
 	loggingRouter.router.ServeHTTP(&loggingWriter, req)
+	statusText := "OK"
 	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 \"OK\"", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
+		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)
+
 }