Merge pull request #185 from konart/fix_npe

Fix null pointer exception in sigterm
deviceinsight · Jan 18, 2024 · b1ae729 · b1ae729
2 parents b279ead + b0d5db0
commit b1ae729
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/internal/consume/GroupConsumer.go b/internal/consume/GroupConsumer.go
@@ -96,10 +96,13 @@ func (handler *groupHandler) ConsumeClaim(session sarama.ConsumerGroupSession, c
 
 	for {
 		select {
-		case message := <-messageChannel:
-			if message != nil {
-				handler.messages <- message
+		case message, ok := <-messageChannel:
+			if !ok {
+				output.Debugf("consume claim via channel interrupted")
+				handler.cancel()
+				return nil
 			}
+			handler.messages <- message
 			session.MarkMessage(message, "")
 		case <-handler.stopConsumers:
 			output.Debugf("stop consume claim via channel")