diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-31 10:33:02 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-31 10:33:02 +0100 |
| commit | 2ec54260350b46c937527bd566b713cf3544f1d2 (patch) | |
| tree | af8a64e92727c4829a64f2ede2203ecfa1ceff4e /synapse/replication | |
| parent | Add replication streams for ex outliers and current state resets (diff) | |
| download | synapse-2ec54260350b46c937527bd566b713cf3544f1d2.tar.xz | |
Use a namedtuple rather than tuple unpacking
Diffstat (limited to 'synapse/replication')
| -rw-r--r-- | synapse/replication/resource.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py index 7afa1242d5..69afcb03d2 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py @@ -204,31 +204,27 @@ class ReplicationResource(Resource): request_events = current_token.events if request_backfill is None: request_backfill = current_token.backfill - ( - events_rows, backfill_rows, - forward_ex_outliers, backward_ex_outliers, - state_resets - ) = yield self.store.get_all_new_events( + res = yield self.store.get_all_new_events( request_backfill, request_events, current_token.backfill, current_token.events, limit ) - writer.write_header_and_rows("events", events_rows, ( + writer.write_header_and_rows("events", res.new_forward_events, ( "position", "internal", "json", "state_group" )) - writer.write_header_and_rows("backfill", backfill_rows, ( + writer.write_header_and_rows("backfill", res.new_backfill_events, ( "position", "internal", "json", "state_group" )) writer.write_header_and_rows( - "forward_ex_outliers", forward_ex_outliers, + "forward_ex_outliers", res.forward_ex_outliers, ("position", "event_id", "state_group") ) writer.write_header_and_rows( - "backward_ex_outliers", backward_ex_outliers, + "backward_ex_outliers", res.backward_ex_outliers, ("position", "event_id", "state_group") ) writer.write_header_and_rows( - "state_resets", state_resets, ("position",) + "state_resets", res.state_resets, ("position",) ) @defer.inlineCallbacks |