Invert closed log logic

kylecarbs · kylecarbs · commit 20115d63e5c7 · 2022-02-03T21:52:55.000Z
diff --git a/peer/conn.go b/peer/conn.go
@@ -145,42 +145,42 @@ func (c *Conn) init() error {
 
 	c.rtc.OnNegotiationNeeded(c.negotiate)
 	c.rtc.OnICEConnectionStateChange(func(iceConnectionState webrtc.ICEConnectionState) {
-		if c.isClosed() {
+		c.closedICEMutex.Lock()
+		defer c.closedICEMutex.Unlock()
+		select {
+		case <-c.closedICE:
+			// Don't log more state changes if we've already closed.
 			return
+		default:
+			if iceConnectionState == webrtc.ICEConnectionStateClosed {
+				// pion/webrtc can update this state multiple times.
+				// A connection can never become un-closed, so we
+				// close the channel if it isn't already.
+				close(c.closedICE)
+			}
 		}
 
 		c.opts.Logger.Debug(context.Background(), "ice connection state updated",
 			slog.F("state", iceConnectionState))
-
-		if iceConnectionState == webrtc.ICEConnectionStateClosed {
-			// pion/webrtc can update this state multiple times.
-			// A connection can never become un-closed, so we
-			// close the channel if it isn't already.
-			c.closedICEMutex.Lock()
-			defer c.closedICEMutex.Unlock()
-			select {
-			case <-c.closedICE:
-			default:
-				close(c.closedICE)
-			}
-		}
 	})
 	c.rtc.OnICEGatheringStateChange(func(iceGatherState webrtc.ICEGathererState) {
-		c.opts.Logger.Debug(context.Background(), "ice gathering state updated",
-			slog.F("state", iceGatherState))
-
-		if iceGatherState == webrtc.ICEGathererStateClosed {
-			// pion/webrtc can update this state multiple times.
-			// A connection can never become un-closed, so we
-			// close the channel if it isn't already.
-			c.closedICEMutex.Lock()
-			defer c.closedICEMutex.Unlock()
-			select {
-			case <-c.closedICE:
-			default:
+		c.closedICEMutex.Lock()
+		defer c.closedICEMutex.Unlock()
+		select {
+		case <-c.closedICE:
+			// Don't log more state changes if we've already closed.
+			return
+		default:
+			if iceGatherState == webrtc.ICEGathererStateClosed {
+				// pion/webrtc can update this state multiple times.
+				// A connection can never become un-closed, so we
+				// close the channel if it isn't already.
 				close(c.closedICE)
 			}
 		}
+
+		c.opts.Logger.Debug(context.Background(), "ice gathering state updated",
+			slog.F("state", iceGatherState))
 	})
 	c.rtc.OnConnectionStateChange(func(peerConnectionState webrtc.PeerConnectionState) {
 		if c.isClosed() {
