summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-29 17:13:51 +0100
committerDavid Baker <dave@matrix.org>2015-04-29 17:13:51 +0100
commit12d381bd5da730d9d4fb2aebcc9fb3d83f9456a7 (patch)
tree78331608b7114bc1ecbc3c82a186aed4175cd073 /synapse/push
parentOops, update the contraint too (diff)
downloadsynapse-12d381bd5da730d9d4fb2aebcc9fb3d83f9456a7.tar.xz
Decode the data json in the storage layer (was moved but this part was missed)
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/pusherpool.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 58fe6ad747..571d8b2f82 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -170,7 +170,11 @@ class PusherPool:
     def _start_pushers(self, pushers):
         logger.info("Starting %d pushers", len(pushers))
         for pusherdict in pushers:
-            p = self._create_pusher(pusherdict)
+            try:
+                p = self._create_pusher(pusherdict)
+            except PusherConfigException:
+                logger.exception("Couldn't start a pusher: caught PusherConfigException")
+                continue
             if p:
                 fullid = "%s:%s:%s" % (
                     pusherdict['app_id'],