Merge pull request #8 from randlabs/health_redesign

Health callback change.

Author: mxmauro

README.md

@@ -51,16 +51,19 @@ func main() {
 	mc.Destroy()
 }
 
-// Health output is in JSON format. Don't forget to add json tags.
+// Health output will be in JSON format.
 type exampleHealthOutput struct {
 	Status  string `json:"status"`
 }
 
 // Our health callback routine.
-func healthCallback() interface{} {
-	return exampleHealthOutput{
+func healthCallback() string {
+	state := exampleHealthOutput{
 		Status: "ok",
 	}
+
+	j, _ := json.Marshal(state)
+	return string(j)
 }
 ```
 

handlers.go

@@ -10,11 +10,13 @@ import (
 
 func (mws *Controller) getHealthHandler() webserver.HandlerFunc {
 	return func(req *request.RequestContext) error {
-		// Get current state from callback
-		state := mws.healthCallback()
+		// Get current health status from callback
+		status := mws.healthCallback()
 
-		// Encode and send output
-		req.WriteJSON(state)
+		// Send output
+		if len(status) > 0 {
+			req.WriteString(status)
+		}
 		req.Success()
 
 		// Done

metrics.go

@@ -60,8 +60,8 @@ type Options struct {
 	Middlewares []webserver.MiddlewareFunc
 }
 
-// HealthCallback indicates a function that returns an object that will be returned as a JSON output.
-type HealthCallback func() interface{}
+// HealthCallback indicates a function that returns a string that will be returned as the output.
+type HealthCallback func() string
 
 // -----------------------------------------------------------------------------
 

metrics_test.go

@@ -1,6 +1,7 @@
 package metrics_test
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/rand"
 	"os"
@@ -129,10 +130,13 @@ func TestWebServer(t *testing.T) {
 
 // -----------------------------------------------------------------------------
 
-func healthCallback() interface{} {
-	return State{
+func healthCallback() string {
+	state := State{
 		System: "all services running",
 	}
+
+	j, _ := json.Marshal(state)
+	return string(j)
 }
 
 func openBrowser(url string) {