Setting apps config as variable

topfreegames · Sep 27, 2017 · 8fedff6 · 8fedff6
1 parent 350eb2b
commit 8fedff6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/config/default.yaml b/config/default.yaml
@@ -3,17 +3,19 @@ gracefulShutdownTimeout: 30
 apns:
   concurrentWorkers: 100
   logStatsInterval: 10000
-  # games:
-  #   game: /certs/cert.pem
+  apps: "game"
+  certs:
+    game: /certs/cert.pem
 gcm:
   pingInterval: 30
   pingTimeout: 10
   maxPendingMessages: 100
   logStatsInterval: 10000
-  # games:
-  #   game:
-  #     apiKey: game-api-key
-  #     senderID: "1233456789"
+  apps: "game"
+  certs:
+    game:
+      apiKey: game-api-key
+      senderID: "1233456789"
 queue:
   topics:
     - "^push-[^-_]+_(apns|gcm)[_-](single|massive)"

diff --git a/config/test.yaml b/config/test.yaml
@@ -3,14 +3,16 @@ gracefulShutdownTimeout: 10
 apns:
   concurrentWorkers: 100
   logStatsInterval: 750
-  games:
+  apps: "game"
+  certs:
     game: ../tls/self_signed_cert.pem
 gcm:
   pingInterval: 30
   pingTimeout: 10
   maxPendingMessages: 3
   logStatsInterval: 750
-  games:
+  apps: "game"
+  certs:
     game:
       apiKey: game-api-key
       senderID: "1233456789"

diff --git a/pusher/apns.go b/pusher/apns.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
+	"strings"
 	"syscall"
 	"time"
 
@@ -107,14 +108,15 @@ func (a *APNSPusher) configure(queue interfaces.APNSPushQueue, db interfaces.DB,
 	}
 	a.MessageHandler = make(map[string]interfaces.MessageHandler)
 	a.Queue = q
-
-	for k, v := range a.Config.GetStringMap("apns.games") {
+	l.Info("Configuring messageHandler")
+	for _, k := range strings.Split(a.Config.GetString("apns.apps"), ",") {
+		cert := a.Config.GetString("apns.certs." + k)
 		l.Infof(
 			"Configuring messageHandler for game %s with certificate: %s",
-			k, v,
+			k, cert,
 		)
 		handler, err := extensions.NewAPNSMessageHandler(
-			v.(string),
+			cert,
 			a.IsProduction,
 			a.Config,
 			a.Logger,

diff --git a/pusher/gcm.go b/pusher/gcm.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
+	"strings"
 	"syscall"
 	"time"
 
@@ -113,7 +114,7 @@ func (g *GCMPusher) configure(client interfaces.GCMClient, db interfaces.DB, sta
 	}
 	g.Queue = q
 	g.MessageHandler = make(map[string]interfaces.MessageHandler)
-	for k := range g.Config.GetStringMap("gcm.games") {
+	for _, k := range strings.Split(g.Config.GetString("gcm.apps"), ",") {
 		senderID := g.Config.GetString("gcm.certs." + k + ".senderID")
 		apiKey := g.Config.GetString("gcm.certs." + k + ".apiKey")
 		l.Infof(