Merge pull request #95 from heschlie/backport-health

Bumping libcalico and fixing health calls
projectcalico · Dec 15, 2017 · 43a9a0d · 43a9a0d
2 parents cb5f10d + 9d523c5
commit 43a9a0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -289,10 +289,7 @@ func (t *TyphaDaemon) Start(cxt context.Context) {
 		go servePrometheusMetrics(t.ConfigParams)
 	}
 
-	if t.ConfigParams.HealthEnabled {
-		log.WithField("port", t.ConfigParams.HealthPort).Info("Health enabled.  Starting server.")
-		go t.healthAggregator.ServeHTTP(t.ConfigParams.HealthPort)
-	}
+	go t.healthAggregator.ServeHTTP(t.ConfigParams.HealthEnabled, t.ConfigParams.HealthPort)
 }
 
 // WaitAndShutDown waits for OS signals or context.Done() and exits as appropriate.