diff options
author | Andrej Shadura <andrewsh@debian.org> | 2019-09-27 17:36:45 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2019-09-27 17:36:45 +0200 |
commit | f11ce76d3a6a25882c0cb243fb3303b526e39210 (patch) | |
tree | 8a917f45af6469325fde5a747ae7fb1757655a07 /synapse/replication/tcp | |
parent | df31d372bad705a18c7c05fc174c760289731a8b (diff) |
New upstream version 1.4.0~rc1
Diffstat (limited to 'synapse/replication/tcp')
-rw-r--r-- | synapse/replication/tcp/streams/_base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py index c10b85d2..f03111c2 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py @@ -158,7 +158,7 @@ class Stream(object): updates, current_token = yield self.get_updates_since(self.last_token) self.last_token = current_token - return (updates, current_token) + return updates, current_token @defer.inlineCallbacks def get_updates_since(self, from_token): @@ -172,14 +172,14 @@ class Stream(object): sent over the replication steam. """ if from_token in ("NOW", "now"): - return ([], self.upto_token) + return [], self.upto_token current_token = self.upto_token from_token = int(from_token) if from_token == current_token: - return ([], current_token) + return [], current_token if self._LIMITED: rows = yield self.update_function( @@ -198,7 +198,7 @@ class Stream(object): if self._LIMITED and len(updates) >= MAX_EVENTS_BEHIND: raise Exception("stream %s has fallen behind" % (self.NAME)) - return (updates, current_token) + return updates, current_token def current_token(self): """Gets the current token of the underlying streams. Should be provided |