[ARVADOS] updated: f51138289b7625bde6cc0bb9840ccf681944941a

git at public.curoverse.com git at public.curoverse.com
Fri Nov 14 15:32:43 EST 2014


Summary of changes:
 services/keepstore/handler_test.go | 2 +-
 services/keepstore/handlers.go     | 4 ++--
 services/keepstore/keepstore.go    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

       via  f51138289b7625bde6cc0bb9840ccf681944941a (commit)
      from  97cd8d6023f918babc5e6cca7f7a1228f4a32d59 (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 f51138289b7625bde6cc0bb9840ccf681944941a
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 14 15:32:04 2014 -0500

    4194: rename RESTRouterWrapper

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 32479d8..2514998 100644
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -750,7 +750,7 @@ func IssueRequest(router *mux.Router, rt *RequestTester) *httptest.ResponseRecor
 	if rt.api_token != "" {
 		req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
 	}
-  routerWrapper := WrapRESTRouter{router}
+  routerWrapper := RESTRouterWrapper{router}
   routerWrapper.ServeHTTP(response, req)
 	return response
 }
diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 5eed4ed..49f55e8 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -745,11 +745,11 @@ func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
   return loggingWriter.ResponseWriter.Write(data)
 }
 
-type WrapRESTRouter struct {
+type RESTRouterWrapper struct {
   router *mux.Router
 }
 
-func (wrapper *WrapRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+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 {
diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 08043cc..eafcc23 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -263,7 +263,7 @@ func main() {
 	KeepVM = MakeRRVolumeManager(goodvols)
 
 	// Tell the built-in HTTP server to direct all requests to the REST router.
-  routerWrapper := WrapRESTRouter{MakeRESTRouter()}
+  routerWrapper := RESTRouterWrapper{MakeRESTRouter()}
   http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
     routerWrapper.ServeHTTP(resp, req)
   })

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list