Merge pull request #3997 from matrix-org/erikj/fix_profile_error_hand…

…ling Fix exception handling in fetching remote profiles
matrix-org · Oct 3, 2018 · 01afcfc · 01afcfc
2 parents 25baf3b + 6e0c66f
commit 01afcfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/changelog.d/3997.bugfix b/changelog.d/3997.bugfix
@@ -0,0 +1 @@
+Fix exception handling in fetching remote profiles
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
@@ -142,10 +142,8 @@ def get_displayname(self, target_user):
                 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 @@ def get_avatar_url(self, target_user):
                 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"])
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix exception handling in fetching remote profiles