diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
| commit | 39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch) | |
| tree | 8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/push/pusherpool.py | |
| parent | Correctly wire in update group profile over federation (diff) | |
| parent | Merge pull request #2568 from matrix-org/rav/pep8 (diff) | |
| download | synapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
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 43cb6e9c01..7c069b662e 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py @@ -137,7 +137,7 @@ class PusherPool: ) yield preserve_context_over_deferred(defer.gatherResults(deferreds)) - except: + except Exception: logger.exception("Exception in pusher on_new_notifications") @defer.inlineCallbacks @@ -162,7 +162,7 @@ class PusherPool: ) yield preserve_context_over_deferred(defer.gatherResults(deferreds)) - except: + except Exception: logger.exception("Exception in pusher on_new_receipts") @defer.inlineCallbacks @@ -188,7 +188,7 @@ class PusherPool: for pusherdict in pushers: try: p = self.pusher_factory.create_pusher(pusherdict) - except: + except Exception: logger.exception("Couldn't start a pusher: caught Exception") continue if p: |