diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-22 17:06:10 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-22 17:06:10 +0100 |
| commit | fd2dbf183676804cb6925972e67969c51c1a4074 (patch) | |
| tree | 9a9344671dc650b85a5bd42b0fb9d6649ae0834f /synapse/replication/tcp/client.py | |
| parent | Update notice format (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-fd2dbf183676804cb6925972e67969c51c1a4074.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/replication/tcp/client.py')
| -rw-r--r-- | synapse/replication/tcp/client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/tcp/client.py b/synapse/replication/tcp/client.py index 970e94313e..cbe9645817 100644 --- a/synapse/replication/tcp/client.py +++ b/synapse/replication/tcp/client.py @@ -107,7 +107,7 @@ class ReplicationClientHandler(object): Can be overriden in subclasses to handle more. """ logger.info("Received rdata %s -> %s", stream_name, token) - self.store.process_replication_rows(stream_name, token, rows) + return self.store.process_replication_rows(stream_name, token, rows) def on_position(self, stream_name, token): """Called when we get new position data. By default this just pokes @@ -115,7 +115,7 @@ class ReplicationClientHandler(object): Can be overriden in subclasses to handle more. """ - self.store.process_replication_rows(stream_name, token, []) + return self.store.process_replication_rows(stream_name, token, []) def on_sync(self, data): """When we received a SYNC we wake up any deferreds that were waiting |