From 7c6ad53d89792b3d5691f7e3ff4cdeb517a5e78e Mon Sep 17 00:00:00 2001
From: Sean Chittenden <sean@chittenden.org>
Date: Mon, 23 May 2016 07:29:08 -0700
Subject: [PATCH] Rename NewConsulService to NewSyncer

---
 client/client.go                   | 4 ++--
 client/consul/sync.go              | 4 ++--
 client/consul/sync_test.go         | 4 ++--
 client/driver/executor/executor.go | 2 +-
 command/agent/agent.go             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/client.go b/client/client.go
index fc7c7d97f..8098e16ee 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1267,9 +1267,9 @@ func (c *Client) addAlloc(alloc *structs.Allocation) error {
 	return nil
 }
 
-// setupConsulClient creates a ConsulService
+// setupConsulClient creates a consul.Syncer
 func (c *Client) setupConsulClient() error {
-	cs, err := consul.NewConsulService(c.config.ConsulAgentConfig, c.logger)
+	cs, err := consul.NewSyncer(c.config.ConsulAgentConfig, c.logger)
 	c.consulSyncer = cs
 	return err
 }
diff --git a/client/consul/sync.go b/client/consul/sync.go
index 5e8cdf360..2aa791924 100644
--- a/client/consul/sync.go
+++ b/client/consul/sync.go
@@ -59,8 +59,8 @@ const (
 	ttlCheckBuffer = 31 * time.Second
 )
 
-// NewConsulService returns a new ConsulService
-func NewConsulService(config *AgentConfig, serverManager *servers.Manager, logger *log.Logger) (*Syncer, error) {
+// NewSyncer returns a new consul.Syncer
+func NewSyncer(config *AgentConfig, logger *log.Logger) (*Syncer, error) {
 	var err error
 	var c *consul.Client
 	cfg := consul.DefaultConfig()
diff --git a/client/consul/sync_test.go b/client/consul/sync_test.go
index a94fdbcee..735b77b07 100644
--- a/client/consul/sync_test.go
+++ b/client/consul/sync_test.go
@@ -41,7 +41,7 @@ var (
 )
 
 func TestConsulServiceRegisterServices(t *testing.T) {
-	cs, err := NewConsulService(&AgentConfig{}, logger)
+	cs, err := NewSyncer(&AgentConfig{}, logger)
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
@@ -68,7 +68,7 @@ func TestConsulServiceRegisterServices(t *testing.T) {
 }
 
 func TestConsulServiceUpdateService(t *testing.T) {
-	cs, err := NewConsulService(&AgentConfig{}, logger)
+	cs, err := NewSyncer(&AgentConfig{}, logger)
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go
index 3b9ac1b46..348733dd7 100644
--- a/client/driver/executor/executor.go
+++ b/client/driver/executor/executor.go
@@ -471,7 +471,7 @@ func (e *UniversalExecutor) SyncServices(ctx *ConsulContext) error {
 	e.logger.Printf("[INFO] executor: registering services")
 	e.consulCtx = ctx
 	if e.consulSyncer == nil {
-		cs, err := consul.NewConsulService(ctx.ConsulAgentConfig, e.logger)
+		cs, err := consul.NewSyncer(ctx.ConsulAgentConfig, e.logger)
 		if err != nil {
 			return err
 		}
diff --git a/command/agent/agent.go b/command/agent/agent.go
index 8807d8d19..5ff90c6b5 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -505,7 +505,7 @@ func (a *Agent) createAgentConfig() {
 // syncAgentServicesWithConsul syncs this Nomad Agent's services with Consul
 // when running in either Client or Server mode.
 func (a *Agent) syncAgentServicesWithConsul(clientHttpAddr string, serverHttpAddr string) error {
-	cs, err := consul.NewConsulService(a.consulAgentConfig, a.logger)
+	cs, err := consul.NewSyncer(a.consulAgentConfig, a.logger)
 	if err != nil {
 		return err
 	}