Added the health status from healthcheck to RuntimeContainer struct

Author: free6k

README.md

@@ -282,7 +282,12 @@ type SwarmNode struct {
 }
 
 type State struct {
-  Running bool
+	Running bool
+	Health  Health
+}
+
+type Health struct {
+	Status string
 }
 
 // Accessible from the root in templates as .Docker

internal/context/context.go

@@ -81,6 +81,11 @@ type Volume struct {
 
 type State struct {
 	Running bool
+	Health  Health
+}
+
+type Health struct {
+	Status string
 }
 
 type RuntimeContainer struct {

internal/generator/generator.go

@@ -275,7 +275,7 @@ func (g *generator) generateFromEvents() {
 						time.Sleep(10 * time.Second)
 						break
 					}
-					if event.Status == "start" || event.Status == "stop" || event.Status == "die" {
+					if event.Status == "start" || event.Status == "stop" || event.Status == "die" || strings.Index(event.Status, "health_status:") != -1 {
 						log.Printf("Received event %s for container %s", event.Status, event.ID[:12])
 						// fanout event to all watchers
 						for _, watcher := range watchers {
@@ -389,6 +389,9 @@ func (g *generator) getContainers() ([]*context.RuntimeContainer, error) {
 			},
 			State: context.State{
 				Running: container.State.Running,
+				Health: context.Health{
+					Status: container.State.Health.Status,
+				},
 			},
 			Name:         strings.TrimLeft(container.Name, "/"),
 			Hostname:     container.Config.Hostname,

internal/generator/generator_test.go

@@ -87,6 +87,11 @@ func TestGenerateFromEvents(t *testing.T) {
 				Pid:       400,
 				ExitCode:  0,
 				StartedAt: time.Now(),
+				Health: docker.Health{
+					Status:        "healthy",
+					FailingStreak: 5,
+					Log:           []docker.HealthCheck{},
+				},
 			},
 			Image: "0ff407d5a7d9ed36acdf3e75de8cc127afecc9af234d05486be2981cdc01a38d",
 			NetworkSettings: &docker.NetworkSettings{

templates/nginx.tmpl

@@ -13,6 +13,12 @@ upstream {{ $host }} {
 
 	{{ $addrLen := len $value.Addresses }}
 	{{ $network := index $value.Networks 0 }}
+
+	{{ if $value.State.Health.Status }}
+		{{ if ne $value.State.Health.Status "healthy" }}
+			{{ continue }}
+		{{ end }}
+	{{ end }}
 
 	{{/* If only 1 port exposed, use that */}}
 	{{ if eq $addrLen 1 }}

test.conf

@@ -0,0 +1,7 @@
+server {
+	listen 80 default_server;
+	server_name _; # This is just an invalid value which will never trigger on a real hostname.
+	error_log /proc/self/fd/2;
+	access_log /proc/self/fd/1;
+	return 503;
+}