kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 19:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

RetryInterval should be a time.Duration

Browse Source
This commit is contained in:
Chelsea Holland Komlo
2018-05-25 17:12:13 -04:00
committed by Alex Dadgar
parent 02a64d0760
commit fa1d2de5df
6 changed files with 32 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
command/agent/command.go
View File

@@ -267,6 +267,14 @@ func (c *Command) readConfig() *Config {
}
}
// COMPAT: Remove in 0.10. 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.")
@@ -560,7 +568,7 @@ func (c *Command) Run(args []string) int {
RetryJoin: config.Server.RetryJoin,
StartJoin: config.Server.StartJoin,
RetryMaxAttempts: config.Server.RetryMaxAttempts,
RetryInterval: config.Server.RetryInterval,
RetryInterval: config.Server.retryInterval,
}
go joiner.RetryJoin(serverJoinInfo)
}