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

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

Browse source
This commit is contained in:
Nelson Elhage 2014-07-10 18:16:47 -07:00
parent c505b49bf8
commit 95f3ebcb43
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
} }