diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-27 16:32:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-03 15:34:19 +0100 |
| commit | 3a1f3f838862cfd2486773079d01e30c2237e8c2 (patch) | |
| tree | 6376669911c085a691a2c9862291b67d0a86dfc6 /synapse/replication/slave/storage/pushers.py | |
| parent | Add basic replication client handler and factory (diff) | |
| download | synapse-3a1f3f838862cfd2486773079d01e30c2237e8c2.tar.xz | |
Change slave storage to use new replication interface
As the TCP replication uses a slightly different API and streams than the HTTP replication. This breaks HTTP replication.
Diffstat (limited to 'synapse/replication/slave/storage/pushers.py')
| -rw-r--r-- | synapse/replication/slave/storage/pushers.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/synapse/replication/slave/storage/pushers.py b/synapse/replication/slave/storage/pushers.py index d88206b3bb..4e8d68ece9 100644 --- a/synapse/replication/slave/storage/pushers.py +++ b/synapse/replication/slave/storage/pushers.py @@ -40,13 +40,9 @@ class SlavedPusherStore(BaseSlavedStore): result["pushers"] = self._pushers_id_gen.get_current_token() return result - def process_replication(self, result): - stream = result.get("pushers") - if stream: - self._pushers_id_gen.advance(int(stream["position"])) - - stream = result.get("deleted_pushers") - if stream: - self._pushers_id_gen.advance(int(stream["position"])) - - return super(SlavedPusherStore, self).process_replication(result) + def process_replication_rows(self, stream_name, token, rows): + if stream_name == "pushers": + self._pushers_id_gen.advance(token) + return super(SlavedPusherStore, self).process_replication_rows( + stream_name, token, rows + ) |