fix graceful shutdown bug introduced by push_expiry, bumped version

topfreegames · Aug 7, 2017 · a554bfb · a554bfb
1 parent d5c656f
commit a554bfb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/config/default.yaml b/config/default.yaml
@@ -11,7 +11,7 @@ gcm:
 queue:
   topics:
     - "com.games.test"
-  brokers: "localhost:9940"
+  brokers: "localhost:9941"
   group: testGroup
   sessionTimeout: 6000
   offsetResetStrategy: latest

diff --git a/extensions/apns_message_handler.go b/extensions/apns_message_handler.go
@@ -196,6 +196,9 @@ func (a *APNSMessageHandler) sendMessage(message []byte) error {
 	if n.PushExpiry > 0 && n.PushExpiry < time.Now().Unix() {
 		l.Warnf("ignoring push message because it has expired: %s", n.Payload)
 		a.ignoredMessages++
+		if a.pendingMessagesWG != nil {
+			a.pendingMessagesWG.Done()
+		}
 		return nil
 	}
 	statsReporterHandleNotificationSent(a.StatsReporters)

diff --git a/extensions/gcm_message_handler.go b/extensions/gcm_message_handler.go
@@ -292,6 +292,9 @@ func (g *GCMMessageHandler) sendMessage(message []byte) error {
 	if km.PushExpiry > 0 && km.PushExpiry < time.Now().Unix() {
 		l.Warnf("ignoring push message because it has expired: %s", km.Data)
 		g.ignoredMessages++
+		if g.pendingMessagesWG != nil {
+			g.pendingMessagesWG.Done()
+		}
 		return nil
 	}
 	l.WithField("message", km).Debug("sending message to gcm")

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 = "2.1.0"
+var Version = "2.1.1"