[ARVADOS] updated: d9ca40ab7cd6ab74fbfcd5287e9075a734107cd0

[git at public.curoverse.com]

Summary of changes:
 services/keepstore/logging_router.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

       via  d9ca40ab7cd6ab74fbfcd5287e9075a734107cd0 (commit)
      from  dd476af362769999d6317bc48a84c35d4d340377 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d9ca40ab7cd6ab74fbfcd5287e9075a734107cd0
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Dec 29 14:37:13 2014 -0500

    4869: Strip all newlines from error responses, not just leading and trailing
    whitespace.

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index d9dfc35..e30df87 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)
+
 }

-----------------------------------------------------------------------


hooks/post-receive
--