github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: merge RetryInterval in config merger

pull/396/head
Ryan Uber 2014-10-12 10:54:53 -07:00
parent 7c91c08457
commit 6d75fc8fb2
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 { if b.RetryMaxAttempts != 0 {
result.RetryMaxAttempts = b.RetryMaxAttempts result.RetryMaxAttempts = b.RetryMaxAttempts
} }
if b.RetryInterval != 0 {
result.RetryInterval = b.RetryInterval
}
if b.DNSConfig.NodeTTL != 0 { if b.DNSConfig.NodeTTL != 0 {
result.DNSConfig.NodeTTL = b.DNSConfig.NodeTTL result.DNSConfig.NodeTTL = b.DNSConfig.NodeTTL
} }