diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2016-05-10 16:30:05 +0200 |
|---|---|---|
| committer | Matthew Hodgson <matthew@arasphere.net> | 2016-05-10 16:30:05 +0200 |
| commit | fe97b81c0929fd6cc31e8f0eb432e88ca8ccb045 (patch) | |
| tree | 0c771563044691d447ea85cf3e3278ef50c07ea9 /synapse/push/pusherpool.py | |
| parent | Merge pull request #763 from matrix-org/erikj/ignore_user (diff) | |
| parent | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs (diff) | |
| download | synapse-fe97b81c0929fd6cc31e8f0eb432e88ca8ccb045.tar.xz | |
Merge pull request #759 from matrix-org/dbkr/email_notifs
Send email notifications for missed messages
Diffstat (limited to 'synapse/push/pusherpool.py')
| -rw-r--r-- | synapse/push/pusherpool.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py index 6ef48d63f7..5853ec36a9 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -17,7 +17,6 @@ from twisted.internet import defer import pusher -from synapse.push import PusherConfigException from synapse.util.logcontext import preserve_fn from synapse.util.async import run_on_reactor @@ -50,6 +49,7 @@ class PusherPool: # recreated, added and started: this means we have only one # code path adding pushers. pusher.create_pusher(self.hs, { + "id": None, "user_name": user_id, "kind": kind, "app_id": app_id, @@ -185,8 +185,8 @@ class PusherPool: for pusherdict in pushers: try: p = pusher.create_pusher(self.hs, pusherdict) - except PusherConfigException: - logger.exception("Couldn't start a pusher: caught PusherConfigException") + except: + logger.exception("Couldn't start a pusher: caught Exception") continue if p: appid_pushkey = "%s:%s" % ( |