bug: remove GCM collapse key

Closes #1149
mozilla-services · Mar 8, 2018 · 65f1003 · 65f1003
1 parent c75b96d
commit 65f1003
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/autopush/router/gcm.py b/autopush/router/gcm.py
@@ -26,7 +26,7 @@ def __init__(self, conf, router_conf, metrics):
         self.metrics = metrics
         self.min_ttl = router_conf.get("ttl", 60)
         self.dryRun = router_conf.get("dryrun", False)
-        self.collapseKey = router_conf.get("collapseKey", "simplepush")
+        self.collapseKey = router_conf.get("collapseKey")
         self.gcm = {}
         self.senderIDs = {}
         # Flatten the SenderID list from human readable and init gcmclient

diff --git a/autopush/router/gcmclient.py b/autopush/router/gcmclient.py
@@ -87,11 +87,12 @@ def __init__(self,
         self.registration_ids = registration_ids
         self.payload = {
             'registration_ids': self.registration_ids,
-            'collapse_key': collapse_key,
             'time_to_live': int(time_to_live),
             'delay_while_idle': False,
             'dry_run': bool(dry_run),
         }
+        if collapse_key:
+            self.payload["collapse_key"] = collapse_key
         if data:
             self.payload['data'] = data