luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

add CheckUpdateStagger to MergeConfig

Browse source
This commit is contained in:
artushin 2015-04-23 16:56:20 -05:00
parent 1e13acba68
commit 1ebc1cf916
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
command/agent/config.go
View file

@ -930,6 +930,9 @@ func MergeConfig(a, b *Config) *Config {
if b.CheckUpdateIntervalRaw != "" || b.CheckUpdateInterval != 0 {
result.CheckUpdateInterval = b.CheckUpdateInterval
}
if b.CheckUpdateStagger {
result.CheckUpdateStagger = true
}
if b.SyslogFacility != "" {
result.SyslogFacility = b.SyslogFacility
}