Skip to content
Snippets Groups Projects
Unverified Commit 01afcfc4 authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handling

Fix exception handling in fetching remote profiles
parents 25baf3b2 6e0c66f6
No related branches found
No related tags found
No related merge requests found
Fix exception handling in fetching remote profiles
......@@ -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"])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment