X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f51138289b7625bde6cc0bb9840ccf681944941a..16384e6d47c96c21e9159ff70c809cac4e7d57da:/services/keepstore/handlers.go diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go index 49f55e8d14..bd1ca67bfc 100644 --- a/services/keepstore/handlers.go +++ b/services/keepstore/handlers.go @@ -728,38 +728,3 @@ func CanDelete(api_token string) bool { func IsDataManagerToken(api_token string) bool { return data_manager_token != "" && api_token == data_manager_token } - -type LoggingResponseWriter struct { - status int - data []byte - http.ResponseWriter -} - -func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) { - loggingWriter.status = code - loggingWriter.ResponseWriter.WriteHeader(code) -} - -func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){ - loggingWriter.data = data - return loggingWriter.ResponseWriter.Write(data) -} - -type RESTRouterWrapper struct { - router *mux.Router -} - -func (wrapper *RESTRouterWrapper) ServeHTTP(resp http.ResponseWriter, req *http.Request) { - loggingWriter := LoggingResponseWriter{200, nil, resp} - wrapper.router.ServeHTTP(&loggingWriter, req) - if loggingWriter.data != nil && loggingWriter.status == 200 { - data_len := len(loggingWriter.data) - if data_len > 200 { // this could be a block, so just print the size - log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.status, data_len) - } else { // this could be a hash or status or a small block etc - log.Printf("[%s] %s %s %d %s", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.status, loggingWriter.data) - } - } else { - log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.status) - } -}