Merge pull request #1678 from hashicorp/b-consul-rpc-server-nil

Use the server's address in debug logging, not the c.lastServer
This commit is contained in:
sean- 2016-02-02 16:05:32 -08:00
commit 8bf63d6a53
1 changed files with 1 additions and 1 deletions

View File

@ -413,7 +413,7 @@ func (c *Client) RPC(method string, args interface{}, reply interface{}) error {
connReuseLowWaterMark = clientRPCMinReuseDuration + lib.RandomStagger(clientRPCMinReuseDuration/clientRPCJitterFraction) connReuseLowWaterMark = clientRPCMinReuseDuration + lib.RandomStagger(clientRPCMinReuseDuration/clientRPCJitterFraction)
numLANMembers = len(c.LANMembers()) numLANMembers = len(c.LANMembers())
c.connRebalanceTime = now.Add(lib.RateScaledInterval(clusterWideRebalanceConnsPerSec, connReuseLowWaterMark, numLANMembers)) c.connRebalanceTime = now.Add(lib.RateScaledInterval(clusterWideRebalanceConnsPerSec, connReuseLowWaterMark, numLANMembers))
c.logger.Printf("[DEBUG] consul: connection to server %s will expire at %v", c.lastServer.Addr, c.connRebalanceTime) c.logger.Printf("[DEBUG] consul: connection to server %s will expire at %v", server.Addr, c.connRebalanceTime)
// Forward to remote Consul // Forward to remote Consul
TRY_RPC: TRY_RPC: