[ARVADOS] updated: b7d408dfa43a15c6b97e35a72a54b23e8880d8c9

git at public.curoverse.com git at public.curoverse.com
Fri Apr 11 18:00:48 EDT 2014


Summary of changes:
 services/keep/keep.go |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

       via  b7d408dfa43a15c6b97e35a72a54b23e8880d8c9 (commit)
      from  df05c261c2b3b3a20f77dcaf8d481a5a113e67e8 (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 b7d408dfa43a15c6b97e35a72a54b23e8880d8c9
Author: Tim Pierce <twp at curoverse.com>
Date:   Fri Apr 11 18:01:14 2014 -0400

    Fix nil map bug and status.json route. (refs #2561)

diff --git a/services/keep/keep.go b/services/keep/keep.go
index 1ea8240..03f0b8f 100644
--- a/services/keep/keep.go
+++ b/services/keep/keep.go
@@ -107,7 +107,7 @@ func main() {
 	rest.HandleFunc(`/{hash:[0-9a-f]{32}}`, PutBlockHandler).Methods("PUT")
 	rest.HandleFunc(`/index`, IndexHandler).Methods("GET", "HEAD")
 	rest.HandleFunc(`/index/{prefix:[0-9a-f]{0,32}}`, IndexHandler).Methods("GET", "HEAD")
-	rest.HandleFunc(`/status\.json`, StatusHandler).Methods("GET", "HEAD")
+	rest.HandleFunc(`/status.json`, StatusHandler).Methods("GET", "HEAD")
 
 	// Tell the built-in HTTP server to direct all requests to the REST
 	// router.
@@ -240,6 +240,7 @@ func StatusHandler(w http.ResponseWriter, req *http.Request) {
 		}
 	}
 
+	st.Volumes = make(map[string]VolumeStatus)
 	for _, vol := range KeepVolumes {
 		st.Volumes[vol] = GetVolumeStatus(vol)
 	}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list