summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-03 11:34:30 +0100
committerErik Johnston <erik@matrix.org>2018-10-03 11:34:30 +0100
commit495a9d06bb21cf30376292d6592aa5fd59a52634 (patch)
tree5d05709413be0ccd9983d399ec6e48780c7428e9
parentMerge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache (diff)
downloadsynapse-495a9d06bb21cf30376292d6592aa5fd59a52634.tar.xz
Fix exception handling in fetching remote profiles
-rw-r--r--synapse/handlers/profile.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index f284d5a385..1dfbde84fd 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -142,10 +142,8 @@ class BaseProfileHandler(BaseHandler):
                 if e.code != 404:
                     logger.exception("Failed to get displayname")
                 raise
-            except Exception:
-                logger.exception("Failed to get displayname")
-            else:
-                defer.returnValue(result["displayname"])
+
+            defer.returnValue(result["displayname"])
 
     @defer.inlineCallbacks
     def set_displayname(self, target_user, requester, new_displayname, by_admin=False):
@@ -199,8 +197,6 @@ class BaseProfileHandler(BaseHandler):
                 if e.code != 404:
                     logger.exception("Failed to get avatar_url")
                 raise
-            except Exception:
-                logger.exception("Failed to get avatar_url")
 
             defer.returnValue(result["avatar_url"])