pushexpiry should be in milliseconds

topfreegames · Oct 23, 2017 · 9561fa7 · 9561fa7
1 parent 1f6f681
commit 9561fa7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/extensions/apns_message_handler.go b/extensions/apns_message_handler.go
@@ -160,7 +160,7 @@ func (a *APNSMessageHandler) sendMessage(message interfaces.KafkaMessage) error
 		l.WithError(err).Error("error marshaling message payload")
 		return err
 	}
-	if n.PushExpiry > 0 && n.PushExpiry < time.Now().Unix() {
+	if n.PushExpiry > 0 && n.PushExpiry < makeTimestamp() {
 		l.Warnf("ignoring push message because it has expired: %s", n.Payload)
 		a.ignoredMessages++
 		if a.pendingMessagesWG != nil {

diff --git a/extensions/apns_message_handler_test.go b/extensions/apns_message_handler_test.go
@@ -626,7 +626,7 @@ var _ = FDescribe("APNS Message Handler", func() {
 			It("should not send message if PushExpiry is in the past", func() {
 				handler.sendMessage(interfaces.KafkaMessage{
 					Topic: "push-game_apns",
-					Value: []byte(fmt.Sprintf(`{ "aps" : { "alert" : "Hello HTTP/2" }, "push_expiry": %d }`, time.Now().Unix()-int64(100))),
+					Value: []byte(fmt.Sprintf(`{ "aps" : { "alert" : "Hello HTTP/2" }, "push_expiry": %d }`, makeTimestamp()-int64(100))),
 				})
 				Eventually(handler.PushQueue.ResponseChannel(), 5*time.Second).ShouldNot(Receive())
 				Expect(handler.sentMessages).To(Equal(int64(0)))
@@ -635,7 +635,7 @@ var _ = FDescribe("APNS Message Handler", func() {
 			It("should send message if PushExpiry is in the future", func() {
 				handler.sendMessage(interfaces.KafkaMessage{
 					Topic: "push-game_apns",
-					Value: []byte(fmt.Sprintf(`{ "aps" : { "alert" : "Hello HTTP/2" }, "push_expiry": %d}`, time.Now().Unix()+int64(100))),
+					Value: []byte(fmt.Sprintf(`{ "aps" : { "alert" : "Hello HTTP/2" }, "push_expiry": %d}`, makeTimestamp()+int64(100))),
 				})
 				Eventually(handler.PushQueue.ResponseChannel(), 5*time.Second).ShouldNot(Receive())
 				Expect(handler.sentMessages).To(Equal(int64(1)))

diff --git a/extensions/gcm_message_handler.go b/extensions/gcm_message_handler.go
@@ -295,7 +295,7 @@ func (g *GCMMessageHandler) sendMessage(message interfaces.KafkaMessage) error {
 		l.WithError(err).Error("Error unmarshaling message.")
 		return err
 	}
-	if km.PushExpiry > 0 && km.PushExpiry < time.Now().Unix() {
+	if km.PushExpiry > 0 && km.PushExpiry < makeTimestamp() {
 		l.Warnf("ignoring push message because it has expired: %s", km.Data)
 		g.ignoredMessages++
 		if g.pendingMessagesWG != nil {

diff --git a/extensions/gcm_message_handler_test.go b/extensions/gcm_message_handler_test.go
@@ -221,7 +221,7 @@ var _ = Describe("GCM Message Handler", func() {
 						Data:   map[string]interface{}{},
 					},
 					metadata,
-					time.Now().Unix() + int64(1000000),
+					makeTimestamp() + int64(1000000),
 				}
 				msgBytes, err := json.Marshal(msg)
 				Expect(err).NotTo(HaveOccurred())
@@ -252,7 +252,7 @@ var _ = Describe("GCM Message Handler", func() {
 						Data:   map[string]interface{}{},
 					},
 					metadata,
-					time.Now().Unix() - int64(100),
+					makeTimestamp() - int64(100),
 				}
 				msgBytes, err := json.Marshal(msg)
 				Expect(err).NotTo(HaveOccurred())
@@ -322,7 +322,7 @@ var _ = Describe("GCM Message Handler", func() {
 						Data:   map[string]interface{}{},
 					},
 					metadata,
-					time.Now().Unix() + int64(1000000),
+					makeTimestamp() + int64(1000000),
 				}
 				msgBytes, err := json.Marshal(msg)
 				Expect(err).NotTo(HaveOccurred())

diff --git a/extensions/utils.go b/extensions/utils.go
@@ -0,0 +1,9 @@
+package extensions
+
+import (
+  "time"
+)
+
+func makeTimestamp() int64 {
+    return time.Now().UnixNano() / (int64(time.Millisecond)/int64(time.Nanosecond))
+}