[ARVADOS] updated: ff0716748c5e94b03dcfd47e9875be3bc7bcb9e6

git at public.curoverse.com git at public.curoverse.com
Mon Nov 17 17:27:23 EST 2014


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

       via  ff0716748c5e94b03dcfd47e9875be3bc7bcb9e6 (commit)
       via  84a1d6a622193dae18c715e0421353da2aecf1f7 (commit)
      from  645a998c13b7dcd21af72187d953b8069288d6d2 (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 ff0716748c5e94b03dcfd47e9875be3bc7bcb9e6
Author: radhika <radhika at curoverse.com>
Date:   Mon Nov 17 17:26:39 2014 -0500

    4194: MakeLoggingRESTRouter returns a pointer rather than the struct.

diff --git a/services/keepstore/router_wrapper.go b/services/keepstore/router_wrapper.go
index 6356889..19f6866 100644
--- a/services/keepstore/router_wrapper.go
+++ b/services/keepstore/router_wrapper.go
@@ -30,12 +30,12 @@ type LoggingRESTRouter struct {
   router *mux.Router
 }
 
-func MakeLoggingRESTRouter() (LoggingRESTRouter) {
+func MakeLoggingRESTRouter() (*LoggingRESTRouter) {
   router := MakeRESTRouter()
-  return (LoggingRESTRouter{router})
+  return (&LoggingRESTRouter{router})
 }
 
-func (loggingRouter LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
   loggingWriter := LoggingResponseWriter{200, bytes.NewBuffer(make([]byte, 0, 0)), resp}
   loggingRouter.router.ServeHTTP(&loggingWriter, req)
   if loggingWriter.Status == 200 {

commit 84a1d6a622193dae18c715e0421353da2aecf1f7
Author: radhika <radhika at curoverse.com>
Date:   Mon Nov 17 17:13:03 2014 -0500

    4194: rename wrapper

diff --git a/services/keepstore/router_wrapper.go b/services/keepstore/router_wrapper.go
index edc169f..6356889 100644
--- a/services/keepstore/router_wrapper.go
+++ b/services/keepstore/router_wrapper.go
@@ -1,6 +1,6 @@
 package main
 
-// RESTRouterWrapper
+// LoggingRESTRouter
 // LoggingResponseWriter
 
 import (
@@ -35,9 +35,9 @@ func MakeLoggingRESTRouter() (LoggingRESTRouter) {
   return (LoggingRESTRouter{router})
 }
 
-func (wrapper LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+func (loggingRouter LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
   loggingWriter := LoggingResponseWriter{200, bytes.NewBuffer(make([]byte, 0, 0)), resp}
-  wrapper.router.ServeHTTP(&loggingWriter, req)
+  loggingRouter.router.ServeHTTP(&loggingWriter, req)
   if loggingWriter.Status == 200 {
     if loggingWriter.Data.Len() > 200 {  // could be large block, so just print the size
       log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:],

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list