4869: Keepstore now returns Content-Length headers, and logs the error message

sent to the client on errors.

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index a954d2b0385d82dfe3e33303898cb297630e25a7..3f0b56062b222b72216ad126172fe91edafcd24b 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -81,6 +81,13 @@ func TestGetHandler(t *testing.T) {
                "Unauthenticated request, unsigned locator",
                string(TEST_BLOCK),
                response)
+
+       received_cl := response.Header().Get("Content-Length")
+       expected_cl := fmt.Sprintf("%d", len(TEST_BLOCK))
+       if received_cl != expected_cl {
+               t.Errorf("expected Content-Length %s, got %s", expected_cl, received_cl)
+       }
+
        received_xbs := response.Header().Get("X-Block-Size")
        expected_xbs := fmt.Sprintf("%d", len(TEST_BLOCK))
        if received_xbs != expected_xbs {
@@ -102,12 +109,19 @@ func TestGetHandler(t *testing.T) {
                "Authenticated request, signed locator", http.StatusOK, response)
        ExpectBody(t,
                "Authenticated request, signed locator", string(TEST_BLOCK), response)
+
        received_xbs = response.Header().Get("X-Block-Size")
        expected_xbs = fmt.Sprintf("%d", len(TEST_BLOCK))
        if received_xbs != expected_xbs {
                t.Errorf("expected X-Block-Size %s, got %s", expected_xbs, received_xbs)
        }
 
+       received_cl = response.Header().Get("Content-Length")
+       expected_cl = fmt.Sprintf("%d", len(TEST_BLOCK))
+       if received_cl != expected_cl {
+               t.Errorf("expected Content-Length %s, got %s", expected_cl, received_cl)
+       }
+
        // Authenticated request, unsigned locator
        // => PermissionError
        response = IssueRequest(&RequestTester{

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index bd1ca67bfc26643190b2e94a0169bc58f2030c88..9d49d803717463d94331991ab045765441ef35b1 100644 (file)
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -175,6 +175,10 @@ func GetBlockHandler(resp http.ResponseWriter, req *http.Request) {
                return
        }
 
+       resp.Header().Set("Content-Length", fmt.Sprintf("%d", len(block)))
+
+       // If/when we support HTTP Range header (#3734), then Content-Length
+       // could be smaller than Block size
        resp.Header().Set("X-Block-Size", fmt.Sprintf("%d", len(block)))
 
        _, err = resp.Write(block)

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index fd4e23467d63d8e91cece66d8e5cd46be7c35cfb..0598d4cb0c88ee358f4ab997e2d27bdf05ea1211 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
+       Response string
 }
 
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
@@ -22,6 +24,9 @@ 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)
+       }
        return loggingWriter.ResponseWriter.Write(data)
 }
 
@@ -35,7 +40,11 @@ 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)
-       log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
+       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)
+       }
 }