summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2016-08-18 13:45:18 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2016-08-18 13:45:18 +0100
commitb3511adb920f81f8847e4cf3112018df08466ad6 (patch)
treeebeb7b3fd23f21e47dcde4a3802385c309a525ab
parentActually make 3PU lookup calls out to ASes (diff)
downloadsynapse-b3511adb920f81f8847e4cf3112018df08466ad6.tar.xz
Don't catch the return-value-as-exception that @defer.inlineCallbacks will use
-rw-r--r--synapse/appservice/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py

index bfc1866591..39b4bff556 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py
@@ -78,7 +78,7 @@ class ApplicationServiceApi(SimpleHttpClient): try: response = yield self.get_json(uri, fields) defer.returnValue(response) - except: + except Exception: # TODO: would be noisy to log lookup failures, but we want to log # other things. Hrm. defer.returnValue([])