fix: Fix receiver pool not cleaning up connections in some instances …

…and preventing shutdown, and add additional logs
driskell · Feb 26, 2024 · f072865 · f072865
1 parent fcd54d6
commit f072865
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lc-lib/receiver/pool.go b/lc-lib/receiver/pool.go
@@ -239,6 +239,7 @@ ReceiverLoop:
 					if shutdownChan == nil && len(r.receivers) == 0 && len(r.connectionStatus) == 0 {
 						break ReceiverLoop
 					}
+					log.Info("Receiver pool waiting on %d connections to close", len(r.connectionStatus))
 				}
 			case *transports.PingEvent:
 				// Immediately send a pong back - ignore failure - remote will time itself out

diff --git a/lc-lib/transports/tcp/receivertcp.go b/lc-lib/transports/tcp/receivertcp.go
@@ -243,7 +243,7 @@ func (t *receiverTCP) connectionRoutine(socket net.Conn, conn *connection) {
 
 	didStart := false
 	if err := conn.run(func() {
-		conn.sendEvent(transports.NewConnectEvent(conn.ctx, socket.RemoteAddr().String(), conn.socket.Desc()))
+		t.eventChan <- transports.NewConnectEvent(conn.ctx, socket.RemoteAddr().String(), conn.socket.Desc())
 		didStart = true
 	}); err != nil {
 		if err == ErrHardCloseRequested {
@@ -256,7 +256,7 @@ func (t *receiverTCP) connectionRoutine(socket net.Conn, conn *connection) {
 	}
 
 	if didStart {
-		conn.sendEvent(transports.NewDisconnectEvent(conn.ctx, socket.RemoteAddr().String(), conn.socket.Desc()))
+		t.eventChan <- transports.NewDisconnectEvent(conn.ctx, socket.RemoteAddr().String(), conn.socket.Desc())
 	}
 
 	t.connMutex.Lock()