diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-24 13:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 13:52:41 +0100 |
| commit | d89f8683dc873c97fc8e046b2eec200a9be0230c (patch) | |
| tree | 19e005a8ff177a3d0d6ee6eae0ea5c03e775a047 /synapse/push/push_tools.py | |
| parent | Merge pull request #1040 from matrix-org/erikj/pagination (diff) | |
| parent | Remove tracer (diff) | |
| download | synapse-d89f8683dc873c97fc8e046b2eec200a9be0230c.tar.xz | |
Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts
Preserve some logcontexts
Diffstat (limited to 'synapse/push/push_tools.py')
| -rw-r--r-- | synapse/push/push_tools.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py index d555a33e9a..becb8ef1ae 100644 --- a/synapse/push/push_tools.py +++ b/synapse/push/push_tools.py @@ -17,14 +17,15 @@ from twisted.internet import defer from synapse.util.presentable_names import ( calculate_room_name, name_from_member_event ) +from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred @defer.inlineCallbacks def get_badge_count(store, user_id): - invites, joins = yield defer.gatherResults([ - store.get_invited_rooms_for_user(user_id), - store.get_rooms_for_user(user_id), - ], consumeErrors=True) + invites, joins = yield preserve_context_over_deferred(defer.gatherResults([ + preserve_fn(store.get_invited_rooms_for_user)(user_id), + preserve_fn(store.get_rooms_for_user)(user_id), + ], consumeErrors=True)) my_receipts_by_room = yield store.get_receipts_for_user( user_id, "m.read", |