diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-08 16:32:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-08 16:32:18 +0100 |
| commit | 476899295f5fd6cff64799bcbc84cd4bf9005e33 (patch) | |
| tree | cacce7f0de3c1b694cce8c805c21c297cfbdeb76 /synapse/handlers/profile.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-476899295f5fd6cff64799bcbc84cd4bf9005e33.tar.xz | |
Change the way we do logging contexts so that they survive divergences
Diffstat (limited to 'synapse/handlers/profile.py')
| -rw-r--r-- | synapse/handlers/profile.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index ee2732b848..a7de7a80f8 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -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 + ) state["displayname"] = displayname state["avatar_url"] = avatar_url |