summary refs log tree commit diff
path: root/synapse/util/async.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-10-23 15:52:32 +0100
committerRichard van der Hoff <richard@matrix.org>2017-10-23 15:52:32 +0100
commiteaaabc6c4f93d49f090ef7ff930fa2739428a36f (patch)
treef5e5f3565589bc31d3dc9580608148b9d2f03a7c /synapse/util/async.py
parentMerge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff)
downloadsynapse-eaaabc6c4f93d49f090ef7ff930fa2739428a36f.tar.xz
replace 'except:' with 'except Exception:'
what could possibly go wrong
Diffstat (limited to 'synapse/util/async.py')
-rw-r--r--synapse/util/async.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py

index a0a9039475..1a884e96ee 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py
@@ -73,7 +73,7 @@ class ObservableDeferred(object): try: # TODO: Handle errors here. self._observers.pop().callback(r) - except: + except Exception: pass return r @@ -83,7 +83,7 @@ class ObservableDeferred(object): try: # TODO: Handle errors here. self._observers.pop().errback(f) - except: + except Exception: pass if consumeErrors: @@ -205,7 +205,7 @@ class Linearizer(object): try: with PreserveLoggingContext(): yield current_defer - except: + except Exception: logger.exception("Unexpected exception in Linearizer") logger.info("Acquired linearizer lock %r for key %r", self.name,