handleAPNSResponse :: pendingMessages.Done() put inside locked block

topfreegames · Feb 14, 2018 · 79d7592 · 79d7592
1 parent f7a85cb
commit 79d7592
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/extensions/apns_message_handler.go b/extensions/apns_message_handler.go
@@ -239,12 +239,6 @@ func (a *APNSMessageHandler) HandleMessages(message interfaces.KafkaMessage) {
 }
 
 func (a *APNSMessageHandler) handleAPNSResponse(responseWithMetadata *structs.ResponseWithMetadata) error {
-	defer func() {
-		if a.pendingMessagesWG != nil {
-			a.pendingMessagesWG.Done()
-		}
-	}()
-
 	// TODO: Remove from timeout heap (will need a different heap implementation for this)
 	l := a.Logger.WithFields(log.Fields{
 		"method": "handleAPNSResponse",
@@ -265,6 +259,10 @@ func (a *APNSMessageHandler) handleAPNSResponse(responseWithMetadata *structs.Re
 		responseWithMetadata.Timestamp = responseWithMetadata.Metadata["timestamp"].(int64)
 		delete(responseWithMetadata.Metadata, "timestamp")
 		delete(a.InflightMessagesMetadata, responseWithMetadata.ApnsID)
+
+		if a.pendingMessagesWG != nil {
+			a.pendingMessagesWG.Done()
+		}
 	}
 	a.inflightMessagesMetadataLock.Unlock()
 

diff --git a/util/version.go b/util/version.go
@@ -23,4 +23,4 @@
 package util
 
 //Version is the current version of pusher
-var Version = "3.2.1"
+var Version = "3.2.2"