Skip to content

Commit

Permalink
Merge pull request #601 from hashicorp/b-retry-interval
Browse files Browse the repository at this point in the history
Fix retry interval not applying sleep duration
  • Loading branch information
dadgar committed Dec 18, 2015
2 parents 3dd339f + 6cf66ff commit 5fcd73f
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions command/agent/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -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, ",")
Expand Down Expand Up @@ -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.")
Expand Down

0 comments on commit 5fcd73f

Please sign in to comment.