From bcf0929c95eb4f3617faecb8cbd3737b146c291c Mon Sep 17 00:00:00 2001
From: Sean Chittenden <sean@chittenden.org>
Date: Thu, 16 Jun 2016 23:29:23 -0700
Subject: [PATCH] Pass a logger arg to `NewClient` and `NewServer`

---
 client/client.go       |  5 +----
 client/client_test.go  | 13 ++++++++-----
 command/agent/agent.go |  4 ++--
 nomad/server.go        |  5 +----
 nomad/server_test.go   |  5 +++--
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/client/client.go b/client/client.go
index a612bffc2..b1fbcaba9 100644
--- a/client/client.go
+++ b/client/client.go
@@ -144,10 +144,7 @@ type Client struct {
 }
 
 // NewClient is used to create a new client from the given configuration
-func NewClient(cfg *config.Config, consulSyncer *consul.Syncer) (*Client, error) {
-	// Create a logger
-	logger := log.New(cfg.LogOutput, "", log.LstdFlags)
-
+func NewClient(cfg *config.Config, consulSyncer *consul.Syncer, logger *log.Logger) (*Client, error) {
 	// Create the client
 	c := &Client{
 		config:             cfg,
diff --git a/client/client_test.go b/client/client_test.go
index 580286f50..9de37776b 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -61,13 +61,14 @@ func testServer(t *testing.T, cb func(*nomad.Config)) (*nomad.Server, string) {
 	}
 
 	shutdownCh := make(chan struct{})
-	consulSyncer, err := consul.NewSyncer(config.ConsulConfig, shutdownCh, log.New(os.Stderr, "", log.LstdFlags))
+	logger := log.New(config.LogOutput, "", log.LstdFlags)
+	consulSyncer, err := consul.NewSyncer(config.ConsulConfig, shutdownCh, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
 	// Create server
-	server, err := nomad.NewServer(config, consulSyncer)
+	server, err := nomad.NewServer(config, consulSyncer, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -87,7 +88,8 @@ func testClient(t *testing.T, cb func(c *config.Config)) *Client {
 		t.Fatalf("err: %v", err)
 	}
 
-	client, err := NewClient(conf, consulSyncer)
+	logger := log.New(conf.LogOutput, "", log.LstdFlags)
+	client, err := NewClient(conf, consulSyncer, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
@@ -475,12 +477,13 @@ func TestClient_SaveRestoreState(t *testing.T) {
 
 	// Create a new client
 	shutdownCh := make(chan struct{})
-	consulSyncer, err := consul.NewSyncer(c1.config.ConsulConfig, shutdownCh, log.New(os.Stderr, "", log.LstdFlags))
+	logger := log.New(config.LogOutput, "", log.LstdFlags)
+	consulSyncer, err := consul.NewSyncer(c1.config.ConsulConfig, shutdownCh, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
-	c2, err := NewClient(c1.config, consulSyncer)
+	c2, err := NewClient(c1.config, consulSyncer, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
diff --git a/command/agent/agent.go b/command/agent/agent.go
index b5526e32a..98cce108e 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -388,7 +388,7 @@ func (a *Agent) setupServer() error {
 	}
 
 	// Create the server
-	server, err := nomad.NewServer(conf, a.consulSyncer)
+	server, err := nomad.NewServer(conf, a.consulSyncer, a.logger)
 	if err != nil {
 		return fmt.Errorf("server setup failed: %v", err)
 	}
@@ -467,7 +467,7 @@ func (a *Agent) setupClient() error {
 	}
 
 	// Create the client
-	client, err := client.NewClient(conf, a.consulSyncer)
+	client, err := client.NewClient(conf, a.consulSyncer, a.logger)
 	if err != nil {
 		return fmt.Errorf("client setup failed: %v", err)
 	}
diff --git a/nomad/server.go b/nomad/server.go
index d604ef603..7d12c8752 100644
--- a/nomad/server.go
+++ b/nomad/server.go
@@ -164,7 +164,7 @@ type endpoints struct {
 
 // NewServer is used to construct a new Nomad server from the
 // configuration, potentially returning an error
-func NewServer(config *Config, consulSyncer *consul.Syncer) (*Server, error) {
+func NewServer(config *Config, consulSyncer *consul.Syncer, logger *log.Logger) (*Server, error) {
 	// Check the protocol version
 	if err := config.CheckVersion(); err != nil {
 		return nil, err
@@ -175,9 +175,6 @@ func NewServer(config *Config, consulSyncer *consul.Syncer) (*Server, error) {
 		config.LogOutput = os.Stderr
 	}
 
-	// Create a logger
-	logger := log.New(config.LogOutput, "", log.LstdFlags)
-
 	// Create an eval broker
 	evalBroker, err := NewEvalBroker(config.EvalNackTimeout, config.EvalDeliveryLimit)
 	if err != nil {
diff --git a/nomad/server_test.go b/nomad/server_test.go
index 9e1bf3a75..0312ae0a4 100644
--- a/nomad/server_test.go
+++ b/nomad/server_test.go
@@ -66,13 +66,14 @@ func testServer(t *testing.T, cb func(*Config)) *Server {
 	config.RaftConfig.StartAsLeader = !config.DevDisableBootstrap
 
 	shutdownCh := make(chan struct{})
-	consulSyncer, err := consul.NewSyncer(config.ConsulConfig, shutdownCh, log.New(config.LogOutput, "", log.LstdFlags))
+	logger := log.New(config.LogOutput, "", log.LstdFlags)
+	consulSyncer, err := consul.NewSyncer(config.ConsulConfig, shutdownCh, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
 	// Create server
-	server, err := NewServer(config, consulSyncer)
+	server, err := NewServer(config, consulSyncer, logger)
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}