Merge pull request #4379 from hashicorp/b-consul-deregister

Fix bug with determining when agent is a client
hashicorp · Jun 6, 2018 · 6122ebb · 6122ebb
2 parents f00e838 + 4d1cc8f
commit 6122ebb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/command/agent/agent.go b/command/agent/agent.go
@@ -958,7 +958,11 @@ func (a *Agent) setupConsul(consulConfig *config.ConsulConfig) error {
 	a.consulCatalog = client.Catalog()
 
 	// Create Consul Service client for service advertisement and checks.
-	a.consulService = consul.NewServiceClient(client.Agent(), a.logger, a.Client() != nil)
+	isClient := false
+	if a.config.Client != nil && a.config.Client.Enabled {
+		isClient = true
+	}
+	a.consulService = consul.NewServiceClient(client.Agent(), a.logger, isClient)
 
 	// Run the Consul service client's sync'ing main loop
 	go a.consulService.Run()