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

agent: merge RetryInterval in config merger

Browse source
This commit is contained in:
Ryan Uber 2014-10-12 10:54:53 -07:00
parent 0266592205
commit f476166fe4
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

@ -700,6 +700,9 @@ func MergeConfig(a, b *Config) *Config {
if b.RetryMaxAttempts != 0 {
result.RetryMaxAttempts = b.RetryMaxAttempts
}
if b.RetryInterval != 0 {
result.RetryInterval = b.RetryInterval
}
if b.DNSConfig.NodeTTL != 0 {
result.DNSConfig.NodeTTL = b.DNSConfig.NodeTTL
}