11906: return error if errors during marshalling json

Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 3de6c9f4d2648e8d8756e2184d556da9a4aed3be..101f42c20c23b82d939137e8bd2e537ef35b6526 100644 (file)
--- 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)