Merge pull request #44 from golift/dn2_crash_fix

Fix crash in PoolStats

client/client.go

@@ -199,7 +199,12 @@ func (c *Client) PoolStats() map[string]*PoolSize {
 	sizes := map[string]*PoolSize{}
 
 	for socket, pool := range c.pools {
-		sizes[socket] = pool.Size()
+		if pool.shutdown {
+			// Use internal method on dead pools.
+			sizes[socket] = pool.size()
+		} else {
+			sizes[socket] = pool.Size()
+		}
 	}
 
 	return sizes

client/pool.go

@@ -132,7 +132,7 @@ func (p *Pool) connector(ctx context.Context, now time.Time) {
 
 func (p *Pool) fillConnectionPool(ctx context.Context, now time.Time, toCreate int) {
 	if p.client.RoundRobinConfig != nil {
-		if toCreate == 0 {
+		if toCreate == 0 || len(p.connections) > 0 {
 			// Keep this up to date, or the logic will skip to the next server prematurely.
 			p.client.lastConn = now
 		} else if now.Sub(p.client.lastConn) > p.client.RetryInterval {
@@ -211,6 +211,10 @@ func (p *Pool) size() *PoolSize {
 		poolSize.LastConn = p.client.lastConn
 	}
 
+	if p.shutdown {
+		return poolSize
+	}
+
 	for _, connection := range p.connections {
 		switch connection.Status() {
 		case CONNECTING: