Fix lock problem in server

traefik · Mar 15, 2019 · 615ceab · 615ceab
1 parent f1b085f
commit 615ceab
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/server/server_entrypoint_tcp.go b/pkg/server/server_entrypoint_tcp.go
@@ -288,16 +288,20 @@ func (c *connectionTracker) RemoveConnection(conn net.Conn) {
 	delete(c.conns, conn)
 }
 
+func (c *connectionTracker) isEmpty() bool {
+	c.lock.RLock()
+	defer c.lock.RUnlock()
+	return len(c.conns) == 0
+}
+
 // Shutdown wait for the connection closing
 func (c *connectionTracker) Shutdown(ctx context.Context) error {
 	ticker := time.NewTicker(500 * time.Millisecond)
 	defer ticker.Stop()
 	for {
-		c.lock.RLock()
-		if len(c.conns) == 0 {
+		if c.isEmpty() {
 			return nil
 		}
-		c.lock.RUnlock()
 		select {
 		case <-ctx.Done():
 			return ctx.Err()