From db4115a68f00bda37d434dba1f5a42ca0e37b5a9 Mon Sep 17 00:00:00 2001 From: Chelsea Holland Komlo Date: Thu, 7 Jun 2018 17:12:36 -0400 Subject: [PATCH] fixup! comment and move to always log server reload operation --- command/agent/command.go | 2 +- nomad/vault_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/command/agent/command.go b/command/agent/command.go index 256914e21..1fa22734c 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -740,9 +740,9 @@ func (c *Command) handleReload() { } } + c.agent.logger.Printf("[DEBUG] agent: starting reload of server config") if s := c.agent.Server(); s != nil { sconf, err := convertServerConfig(newConf, c.logOutput) - c.agent.logger.Printf("[DEBUG] agent: starting reload of server config") if err != nil { c.agent.logger.Printf("[ERR] agent: failed to convert server config: %v", err) return diff --git a/nomad/vault_test.go b/nomad/vault_test.go index 2c165fb6a..5ba75f4da 100644 --- a/nomad/vault_test.go +++ b/nomad/vault_test.go @@ -438,7 +438,7 @@ func TestVaultClient_SetConfig(t *testing.T) { t.Fatalf("unexpected token: %v", client.tokenData) } - // test that when SetConfig is called with the same configuration, it is a + // Test that when SetConfig is called with the same configuration, it is a // no-op failCh := make(chan struct{}, 1) go func() {