summary refs log tree commit diff
path: root/synapse/push/pusherpool.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-10-23 17:39:31 +0100
committerGitHub <noreply@github.com>2017-10-23 17:39:31 +0100
commit0d437698b2e040eface5094852576c43916c2e0c (patch)
tree9090c6c6f5ba5566786b8654cee07b3c3acd97c8 /synapse/push/pusherpool.py
parentMerge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff)
parentfix vars named `l` (diff)
downloadsynapse-0d437698b2e040eface5094852576c43916c2e0c.tar.xz
Merge pull request #2568 from matrix-org/rav/pep8
PEP8 fixes
Diffstat (limited to 'synapse/push/pusherpool.py')
-rw-r--r--synapse/push/pusherpool.py6
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: