status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: handleEnterpriseLeave (#6453)

This commit is contained in:
Hans Hasselberg 2019-09-11 11:01:37 +02:00 committed by GitHub
parent 5096a2fe39
commit 4a20efda9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/consul/enterprise_server_oss.go
View File

@ -34,6 +34,10 @@ func (s *Server) handleEnterpriseRPCConn(rtype pool.RPCType, conn net.Conn, isTL
return false return false
} }
func (s *Server) handleEnterpriseLeave() {
return
}
func (s *Server) enterpriseStats() map[string]map[string]string { func (s *Server) enterpriseStats() map[string]map[string]string {
return nil return nil
} }

3
agent/consul/server.go
View File

@ -897,6 +897,9 @@ func (s *Server) Leave() error {
} }
} }
// Leave everything enterprise related as well
s.handleEnterpriseLeave()
// Start refusing RPCs now that we've left the LAN pool. It's important // Start refusing RPCs now that we've left the LAN pool. It's important
// to do this *after* we've left the LAN pool so that clients will know // to do this *after* we've left the LAN pool so that clients will know
// to shift onto another server if they perform a retry. We also wake up // to shift onto another server if they perform a retry. We also wake up