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

Cleans up after merge.

This commit is contained in:
James Phillips 2017-03-13 19:18:43 -07:00
parent 472f1bd63e
commit fe2bd89563
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consul/autopilot.go
View File

@ -361,6 +361,6 @@ func (s *Server) getServerHealth(id string) *structs.ServerHealth {
func (s *Server) getServerStats(server *agent.Server) (structs.ServerStats, error) {
var args struct{}
var reply structs.ServerStats
err := s.connPool.RPC(s.config.Datacenter, server.Addr, server.Version, "Status.RaftStats", &args, &reply)
err := s.connPool.RPC(s.config.Datacenter, server.Addr.String(), server.Version, "Status.RaftStats", &args, &reply)
return reply, err
}

2
consul/server.go
View File

@ -257,7 +257,7 @@ func NewServer(config *Config) (*Server, error) {
logger: logger,
reconcileCh: make(chan serf.Member, 32),
remoteConsuls: make(map[string][]*agent.Server, 4),
router: servers.NewRouter(loogger, shutdownCh),
router: servers.NewRouter(logger, shutdownCh),
rpcServer: rpc.NewServer(),
rpcTLS: incomingTLS,
tombstoneGC: gc,