summary refs log tree commit diff
path: root/synapse/handlers/profile.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-12 13:14:29 +0100
committerErik Johnston <erik@matrix.org>2015-05-12 13:14:29 +0100
commit95dedb866f04ee4ae034c35130f2a8dc86243fbb (patch)
tree80080d23bffdfd8badb1d4b56cb4dc4884a61d4b /synapse/handlers/profile.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_co... (diff)
downloadsynapse-95dedb866f04ee4ae034c35130f2a8dc86243fbb.tar.xz
Unwrap defer.gatherResults failures
Diffstat (limited to 'synapse/handlers/profile.py')
-rw-r--r--synapse/handlers/profile.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py

index ffb449d457..71ff78ab23 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py
@@ -18,6 +18,7 @@ from twisted.internet import defer from synapse.api.errors import SynapseError, AuthError, CodeMessageException from synapse.api.constants import EventTypes, Membership from synapse.types import UserID +from synapse.util import unwrapFirstError from ._base import BaseHandler @@ -159,7 +160,7 @@ class ProfileHandler(BaseHandler): self.store.get_profile_avatar_url(user.localpart), ], consumeErrors=True - ) + ).addErrback(unwrapFirstError) state["displayname"] = displayname state["avatar_url"] = avatar_url