Delegate handler cancel to the pool

ghettovoice · Sep 30, 2021 · 214556e · 214556e
1 parent c64d104
commit 214556e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.idea/runConfigurations/go_test_pkg.xml b/.idea/runConfigurations/go_test_pkg.xml
diff --git a/transport/connection_pool.go b/transport/connection_pool.go
@@ -875,7 +875,11 @@ func (handler *connectionHandler) readConnection() (<-chan sip.Message, <-chan e
 
 	go func() {
 		defer func() {
-			handler.Cancel()
+			handler.cancelOnce.Do(func() {
+				if err := handler.Connection().Close(); err != nil {
+					handler.Log().Errorf("connection close failed: %s", err)
+				}
+			})
 			prs.Stop()
 
 			if !streamed {
@@ -1019,7 +1023,7 @@ func (handler *connectionHandler) pipeOutputs(msgs <-chan sip.Message, errs <-ch
 			handler.Log().Trace("passing up connection expiry error...")
 
 			select {
-			case <-handler.canceled:
+			case <-handler.cancel:
 				return
 			case handler.errs <- err:
 				handler.Log().Trace("connection expiry error passed up")
@@ -1084,7 +1088,7 @@ func (handler *connectionHandler) pipeOutputs(msgs <-chan sip.Message, errs <-ch
 
 			// pass up
 			select {
-			case <-handler.canceled:
+			case <-handler.cancel:
 				return
 			case handler.output <- msg:
 				logger.Trace("SIP message passed up")
@@ -1119,7 +1123,7 @@ func (handler *connectionHandler) pipeOutputs(msgs <-chan sip.Message, errs <-ch
 			handler.Log().Trace("passing up error...")
 
 			select {
-			case <-handler.canceled:
+			case <-handler.cancel:
 				return
 			case handler.errs <- err:
 				handler.Log().Trace("error passed up")

diff --git a/transport/listener_pool.go b/transport/listener_pool.go
@@ -712,7 +712,11 @@ func (handler *listenerHandler) Serve(done func()) {
 
 func (handler *listenerHandler) acceptConnections(wg *sync.WaitGroup, conns chan<- Connection, errs chan<- error) {
 	defer func() {
-		handler.Cancel()
+		handler.cancelOnce.Do(func() {
+			if err := handler.Listener().Close(); err != nil {
+				handler.Log().Errorf("close listener failed: %s", err)
+			}
+		})
 		close(conns)
 		close(errs)
 
@@ -791,7 +795,7 @@ func (handler *listenerHandler) pipeOutputs(wg *sync.WaitGroup, conns <-chan Con
 				logger.Trace("passing up connection...")
 
 				select {
-				case <-handler.canceled:
+				case <-handler.cancel:
 					return
 				case handler.output <- conn:
 					logger.Trace("connection passed up")
@@ -817,7 +821,7 @@ func (handler *listenerHandler) pipeOutputs(wg *sync.WaitGroup, conns <-chan Con
 				handler.Log().Trace("passing up listener error...")
 
 				select {
-				case <-handler.canceled:
+				case <-handler.cancel:
 					return
 				case handler.errs <- err:
 					handler.Log().Trace("listener error passed up")