Merge pull request #205 from princjef/receiver-block

Unblock receiver goroutine on shutdown
Azure · Feb 11, 2021 · 7b808b3 · 7b808b3
2 parents f421926 + f043fdc
commit 7b808b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## `v3.3.6`
+- fix goroutine leak on listener close
+
 ## `v3.3.5`
 - Remove the check for temporary network errors in sender.go [#80](https://github.com/Azure/azure-event-hubs-go/issues/80)
 

diff --git a/receiver.go b/receiver.go
@@ -287,8 +287,15 @@ func (r *receiver) listenForMessages(ctx context.Context, msgChan chan *amqp.Mes
 	for {
 		msg, err := r.listenForMessage(ctx)
 		if err == nil {
-			msgChan <- msg
-			continue
+			select {
+			case msgChan <- msg:
+				// Sent
+				continue
+			case <-ctx.Done():
+				// Context canceled before send, ignore and shut down
+				tab.For(ctx).Debug("context done")
+				return
+			}
 		}
 
 		select {