Re-add duplicate server check but do it properly this time
parent
4ce3bade10
commit
9a06c8f860
12
config.go
12
config.go
|
@ -256,15 +256,17 @@ func LoadConfig() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dynamic servers shouldn't be deleted silently.
|
// Dynamic servers shouldn't be deleted silently.
|
||||||
DynLoop:
|
|
||||||
for name, srv := range oldConf.Servers {
|
for name, srv := range oldConf.Servers {
|
||||||
if srv.dynamic {
|
if srv.dynamic {
|
||||||
|
if _, ok := config.Servers[name]; ok {
|
||||||
|
config = oldConf
|
||||||
|
return fmt.Errorf("duplicate server %s", name)
|
||||||
|
}
|
||||||
|
|
||||||
config.Servers[name] = srv
|
config.Servers[name] = srv
|
||||||
} else {
|
} else {
|
||||||
for name2 := range config.Servers {
|
if _, ok := config.Servers[name]; ok {
|
||||||
if name == name2 {
|
continue
|
||||||
continue DynLoop
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for cc := range Clts() {
|
for cc := range Clts() {
|
||||||
|
|
Loading…
Reference in New Issue