diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-12 15:31:26 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-12 15:31:26 +0100 |
| commit | 4429e4bf2499b0b3fecc8637c2a7a932aab908e4 (patch) | |
| tree | 0c17e1767434df9684c3d34263a161ba4fa1d9b9 /synapse/handlers/profile.py | |
| parent | Update the end_token correctly, otherwise the token doesn't advance and the c... (diff) | |
| parent | Merge pull request #143 from matrix-org/erikj/SYN-375 (diff) | |
| download | synapse-4429e4bf2499b0b3fecc8637c2a7a932aab908e4.tar.xz | |
Merge branch 'develop' into notifier_unify
Conflicts: synapse/notifier.py
Diffstat (limited to 'synapse/handlers/profile.py')
| -rw-r--r-- | synapse/handlers/profile.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index ee2732b848..71ff78ab23 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -17,8 +17,8 @@ from twisted.internet import defer from synapse.api.errors import SynapseError, AuthError, CodeMessageException from synapse.api.constants import EventTypes, Membership -from synapse.util.logcontext import PreserveLoggingContext from synapse.types import UserID +from synapse.util import unwrapFirstError from ._base import BaseHandler @@ -154,14 +154,13 @@ class ProfileHandler(BaseHandler): if not self.hs.is_mine(user): defer.returnValue(None) - with PreserveLoggingContext(): - (displayname, avatar_url) = yield defer.gatherResults( - [ - self.store.get_profile_displayname(user.localpart), - self.store.get_profile_avatar_url(user.localpart), - ], - consumeErrors=True - ) + (displayname, avatar_url) = yield defer.gatherResults( + [ + self.store.get_profile_displayname(user.localpart), + self.store.get_profile_avatar_url(user.localpart), + ], + consumeErrors=True + ).addErrback(unwrapFirstError) state["displayname"] = displayname state["avatar_url"] = avatar_url |