mirror of https://github.com/hashicorp/consul
formatting
parent
aa6ffc90f0
commit
cfca160cd5
|
@ -463,7 +463,8 @@ func (a *Agent) RemoveService(serviceID string) error {
|
||||||
// Protect "consul" service from deletion by a user
|
// Protect "consul" service from deletion by a user
|
||||||
if a.server != nil && serviceID == consul.ConsulServiceID {
|
if a.server != nil && serviceID == consul.ConsulServiceID {
|
||||||
return fmt.Errorf(
|
return fmt.Errorf(
|
||||||
"Deregistering the %s service is not allowed", consul.ConsulServiceID)
|
"Deregistering the %s service is not allowed",
|
||||||
|
consul.ConsulServiceID)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove service immeidately
|
// Remove service immeidately
|
||||||
|
|
|
@ -334,7 +334,6 @@ func (l *localState) setSyncState() error {
|
||||||
if id == consul.SerfCheckID {
|
if id == consul.SerfCheckID {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
l.checkStatus[id] = syncStatus{remoteDelete: true}
|
l.checkStatus[id] = syncStatus{remoteDelete: true}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue