Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up logic and add comments

This commit is contained in:
Andrew Morgan 2019-03-04 15:08:15 +00:00
parent 9f7cdf3da1
commit fe7bd23a85
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/replication/tcp/protocol.py
View File

@ -487,15 +487,19 @@ class ServerReplicationStreamProtocol(BaseReplicationStreamProtocol):
# through tokens until we find one that is not None and then # through tokens until we find one that is not None and then
# process all previous updates in the batch as if they had the # process all previous updates in the batch as if they had the
# final token. # final token.
if not token or len(batch_updates) > 0:
if token is None: if token is None:
# Store this update as part of the batch # Store this update as part of a batch
batch_updates.append(update) batch_updates.append(update)
elif current_token <= current_token: continue
# This batch is older than current_token, dismiss
if len(batch_updates) > 0:
# There is an ongoing batch and this is the end
if current_token <= current_token:
# This batch is older than current_token, dismiss it
batch_updates = [] batch_updates = []
else: else:
# Append final update of this batch before sending # This is the end of the batch. Append final update of
# this batch before sending
batch_updates.append(update) batch_updates.append(update)
# Send all updates that are part of this batch with the # Send all updates that are part of this batch with the
@ -505,7 +509,10 @@ class ServerReplicationStreamProtocol(BaseReplicationStreamProtocol):
# Clear saved batch updates # Clear saved batch updates
batch_updates = [] batch_updates = []
else: continue
# This is an update that's not part of a batch.
#
# Only send updates newer than the current token # Only send updates newer than the current token
if token > current_token: if token > current_token:
self.send_command(RdataCommand(stream_name, token, update)) self.send_command(RdataCommand(stream_name, token, update))