From 6cf66ff231a486b3e3a909926dcf258774ce4f76 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Thu, 17 Dec 2015 16:33:09 -0800 Subject: [PATCH] Fix retry interval not applying sleep duration --- command/agent/command.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/command/agent/command.go b/command/agent/command.go index 4ec51a5fcdd..6976b9d76ff 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -107,15 +107,6 @@ func (c *Command) readConfig() *Config { return nil } - if cmdConfig.Server.RetryInterval != "" { - dur, err := time.ParseDuration(cmdConfig.Server.RetryInterval) - if err != nil { - c.Ui.Error(fmt.Sprintf("Error parsing retry interval: %s", err)) - return nil - } - cmdConfig.Server.retryInterval = dur - } - // Split the servers. if servers != "" { cmdConfig.Client.Servers = strings.Split(servers, ",") @@ -188,6 +179,14 @@ func (c *Command) readConfig() *Config { return config } + // Parse the RetryInterval. + dur, err := time.ParseDuration(config.Server.RetryInterval) + if err != nil { + c.Ui.Error(fmt.Sprintf("Error parsing retry interval: %s", err)) + return nil + } + config.Server.retryInterval = dur + // Check that the server is running in at least one mode. if !(config.Server.Enabled || config.Client.Enabled) { c.Ui.Error("Must specify either server, client or dev mode for the agent.")