[ARVADOS] updated: e6b3f6f6bb048e59e9683c93257b512ba74feed6

[Git user]

Summary of changes:
 services/keepstore/handlers.go | 2 ++
 1 file changed, 2 insertions(+)

       via  e6b3f6f6bb048e59e9683c93257b512ba74feed6 (commit)
      from  499e303783a9b5430147ac4eef3bd13ff72968b9 (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 e6b3f6f6bb048e59e9683c93257b512ba74feed6
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 17 16:16:34 2017 -0400

    11906: return error if errors during marshalling json
    
    Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 3de6c9f..101f42c 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -625,6 +625,7 @@ func HealthCheckPingHandler(resp http.ResponseWriter, req *http.Request) {
 	fn := func() interface{} {
 		return map[string]string{"health": "OK"}
 	}
+
 	healthCheckDo(resp, req, fn)
 }
 
@@ -641,6 +642,7 @@ func healthCheckDo(resp http.ResponseWriter, req *http.Request, fn healthCheckFu
 	ok, err := json.Marshal(fn())
 	if err != nil {
 		http.Error(resp, err.Error(), 500)
+		return
 	}
 
 	resp.Write(ok)

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


hooks/post-receive
--