diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
| commit | 62b89daac6f4418d831d531fa40ad71aa0c74fb9 (patch) | |
| tree | a5fa797ac7e65f85cae52cccd88451e5672257c6 /synapse/push/push_tools.py | |
| parent | Always advance stream tokens (diff) | |
| parent | Merge pull request #2095 from matrix-org/rav/cull_log_preserves (diff) | |
| download | synapse-62b89daac6f4418d831d531fa40ad71aa0c74fb9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_server
Diffstat (limited to 'synapse/push/push_tools.py')
| -rw-r--r-- | synapse/push/push_tools.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py index 287df94b4f..6835f54e97 100644 --- a/synapse/push/push_tools.py +++ b/synapse/push/push_tools.py @@ -17,15 +17,12 @@ from twisted.internet import defer from synapse.push.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 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)) + invites = yield store.get_invited_rooms_for_user(user_id) + joins = yield store.get_rooms_for_user(user_id) my_receipts_by_room = yield store.get_receipts_for_user( user_id, "m.read", |