Merge pull request #1408 from hyperledger/return-status-from-health

Silas Davis · web-flow · commit b27d0ff618c1 · 2021-01-26T12:07:40.000+01:00
Return status from health check
diff --git a/vent/service/server.go b/vent/service/server.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 
 	"github.com/hyperledger/burrow/logging"
@@ -70,6 +71,11 @@ func healthHandler(consumer *Consumer) func(resp http.ResponseWriter, req *http.
 			resp.WriteHeader(http.StatusServiceUnavailable)
 		} else {
 			resp.WriteHeader(http.StatusOK)
+			bs, err := json.Marshal(consumer.statusMessage())
+			if err == nil {
+				resp.Header().Set("Content-Type", "application/json")
+				resp.Write(bs)
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package service`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "encoding/json"`
`5`	`6`	`"net/http"`
`6`	`7`
`7`	`8`	`"github.com/hyperledger/burrow/logging"`
`@@ -70,6 +71,11 @@ func healthHandler(consumer Consumer) func(resp http.ResponseWriter, req http.`
`70`	`71`	`resp.WriteHeader(http.StatusServiceUnavailable)`
`71`	`72`	`} else {`
`72`	`73`	`resp.WriteHeader(http.StatusOK)`
	`74`	`+ bs, err := json.Marshal(consumer.statusMessage())`
	`75`	`+ if err == nil {`
	`76`	`+ resp.Header().Set("Content-Type", "application/json")`
	`77`	`+ resp.Write(bs)`
	`78`	`+ }`
`73`	`79`	`}`
`74`	`80`	`}`
`75`	`81`	`}`