4194: rename RESTRouterWrapper as LoggingRESTRouter

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index fbf4ef32521742e8f60d59814d696200eba80db6..d1be04a420174998358733a2d5c5335166587875 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -731,8 +731,8 @@ func IssueRequest(rt *RequestTester) *httptest.ResponseRecorder {
        if rt.api_token != "" {
                req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
        }
-  routerWrapper := MakeRESTRouterWrapper()
-  routerWrapper.ServeHTTP(response, req)
+  loggingRouter := MakeLoggingRESTRouter()
+  loggingRouter.ServeHTTP(response, req)
        return response
 }
 

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 5ec1ad06d4a4dbee9df6986e97b7d7445718332d..3c6d634498cdb5497ba686fc4a8c640f0016431b 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -263,9 +263,9 @@ func main() {
        KeepVM = MakeRRVolumeManager(goodvols)
 
        // Tell the built-in HTTP server to direct all requests to the REST router.
-  routerWrapper := MakeRESTRouterWrapper()
+  loggingRouter := MakeLoggingRESTRouter()
   http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
-    routerWrapper.ServeHTTP(resp, req)
+    loggingRouter.ServeHTTP(resp, req)
   })
 
        // Set up a TCP listener.

diff --git a/services/keepstore/router_wrapper.go b/services/keepstore/router_wrapper.go
index b1ebd41d8b2e0eb0471247559bb65039e003d177..edc169fb8159f617edac18b518bad838af714fcc 100644 (file)
--- a/services/keepstore/router_wrapper.go
+++ b/services/keepstore/router_wrapper.go
@@ -26,16 +26,16 @@ func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
   return loggingWriter.ResponseWriter.Write(data)
 }
 
-type RESTRouterWrapper struct {
+type LoggingRESTRouter struct {
   router *mux.Router
 }
 
-func MakeRESTRouterWrapper() (RESTRouterWrapper) {
+func MakeLoggingRESTRouter() (LoggingRESTRouter) {
   router := MakeRESTRouter()
-  return (RESTRouterWrapper{router})
+  return (LoggingRESTRouter{router})
 }
 
-func (wrapper RESTRouterWrapper) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+func (wrapper LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
   loggingWriter := LoggingResponseWriter{200, bytes.NewBuffer(make([]byte, 0, 0)), resp}
   wrapper.router.ServeHTTP(&loggingWriter, req)
   if loggingWriter.Status == 200 {