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

While we're at it, make statsite_addr work at all.

pull/243/head
Nelson Elhage 2014-07-10 18:16:47 -07:00
parent 825dcd04f4
commit f3b9fcb49a
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

@ -500,6 +500,9 @@ func MergeConfig(a, b *Config) *Config {
if b.SkipLeaveOnInt == true { if b.SkipLeaveOnInt == true {
result.SkipLeaveOnInt = true result.SkipLeaveOnInt = true
} }
if b.StatsiteAddr != "" {
result.StatsiteAddr = b.StatsiteAddr
}
if b.EnableDebug { if b.EnableDebug {
result.EnableDebug = true result.EnableDebug = true
} }