Restore NotifyListen to avoid panic in newServer retry (#6200)

hashicorp · Jul 23, 2019 · d86efb8 · d86efb8
1 parent a13de7d
commit d86efb8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go
@@ -183,6 +183,10 @@ func newServer(c *Config) (*Server, error) {
 			oldNotify()
 		}
 	}
+	// Restore old notify to guard against re-closing `up` on a retry
+	defer func() {
+		c.NotifyListen = oldNotify
+	}()
 
 	// start server
 	w := c.LogOutput