cleaner stats logging

topfreegames · Jan 23, 2017 · 3a59bd0 · 3a59bd0
1 parent 02354a4
commit 3a59bd0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/extensions/apns_message_handler.go b/extensions/apns_message_handler.go
@@ -309,17 +309,19 @@ func (a *APNSMessageHandler) handleAPNSResponse(res push.Response) error {
 // LogStats from time to time
 func (a *APNSMessageHandler) LogStats() {
 	l := a.Logger.WithFields(log.Fields{
-		"method":   "logStats",
-		"interval": a.LogStatsInterval,
+		"method":       "logStats",
+		"interval(ns)": a.LogStatsInterval,
 	})
 
 	ticker := time.NewTicker(a.LogStatsInterval)
 	for range ticker.C {
 		apnsResMutex.Lock()
-		l.WithField("count", a.sentMessages).Info("Sent messages")
-		l.WithField("count", a.responsesReceived).Info("Responses received")
-		l.WithField("count", a.successesReceived).Info("Successes received")
-		l.WithField("count", a.failuresReceived).Info("Failures received")
+		l.WithFields(log.Fields{
+			"sentMessages":      a.sentMessages,
+			"responsesReceived": a.responsesReceived,
+			"successesReceived": a.successesReceived,
+			"failuresReceived":  a.failuresReceived,
+		}).Info("flushing stats")
 		a.sentMessages = 0
 		a.responsesReceived = 0
 		a.successesReceived = 0

diff --git a/extensions/apns_message_handler_test.go b/extensions/apns_message_handler_test.go
@@ -378,14 +378,11 @@ var _ = Describe("APNS Message Handler", func() {
 				handler.successesReceived = 60
 				handler.failuresReceived = 30
 				Expect(func() { go handler.LogStats() }).ShouldNot(Panic())
+				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("flushing stats"))
 				Eventually(func() int64 { return handler.sentMessages }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Sent messages"))
 				Eventually(func() int64 { return handler.responsesReceived }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Responses received"))
 				Eventually(func() int64 { return handler.successesReceived }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Successes received"))
 				Eventually(func() int64 { return handler.failuresReceived }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Failures received"))
 			})
 		})
 

diff --git a/extensions/gcm_message_handler.go b/extensions/gcm_message_handler.go
@@ -315,17 +315,19 @@ func (g *GCMMessageHandler) HandleMessages(msgChan *chan []byte) {
 // LogStats from time to time
 func (g *GCMMessageHandler) LogStats() {
 	l := g.Logger.WithFields(log.Fields{
-		"method":   "logStats",
-		"interval": g.LogStatsInterval,
+		"method":       "logStats",
+		"interval(ns)": g.LogStatsInterval,
 	})
 
 	ticker := time.NewTicker(g.LogStatsInterval)
 	for range ticker.C {
 		apnsResMutex.Lock()
-		l.WithField("count", g.sentMessages).Info("Sent messages")
-		l.WithField("count", g.responsesReceived).Info("Responses received")
-		l.WithField("count", g.successesReceived).Info("Successes received")
-		l.WithField("count", g.failuresReceived).Info("Failures received")
+		l.WithFields(log.Fields{
+			"sentMessages":      g.sentMessages,
+			"responsesReceived": g.responsesReceived,
+			"successesReceived": g.successesReceived,
+			"failuresReceived":  g.failuresReceived,
+		}).Info("flushing stats")
 		g.sentMessages = 0
 		g.responsesReceived = 0
 		g.successesReceived = 0

diff --git a/extensions/gcm_message_handler_test.go b/extensions/gcm_message_handler_test.go
@@ -308,14 +308,11 @@ var _ = Describe("GCM Message Handler", func() {
 				handler.successesReceived = 60
 				handler.failuresReceived = 30
 				Expect(func() { go handler.LogStats() }).ShouldNot(Panic())
+				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("flushing stats"))
 				Eventually(func() int64 { return handler.sentMessages }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Sent messages"))
 				Eventually(func() int64 { return handler.responsesReceived }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Responses received"))
 				Eventually(func() int64 { return handler.successesReceived }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Successes received"))
 				Eventually(func() int64 { return handler.failuresReceived }).Should(Equal(int64(0)))
-				Eventually(func() []*logrus.Entry { return hook.Entries }).Should(ContainLogMessage("Failures received"))
 			})
 		})