Fix exception handling in fetching remote profiles

6 years ago · 495a9d06bb
parent 25baf3b2ac
commit 495a9d06bb
1 changed files with 2 additions and 6 deletions
--- 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"])