Skip to content
Snippets Groups Projects
Commit a8c17da2 authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files

Merge branch 'release-v1.13.0' into rav/fix_dropped_messages

parents 12422673 5b8023dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changelog.d/7421.misc 0 → 100644
+ 1
− 0
View file @ a8c17da2
Move catchup of replication streams logic to worker.
synapse/replication/tcp/handler.py
+ 1
− 1
View file @ a8c17da2
...@@ -265,7 +265,7 @@ class ReplicationCommandHandler: ...@@ -265,7 +265,7 @@ class ReplicationCommandHandler:
if not sbc or stream_name not in sbc: if not sbc or stream_name not in sbc:
# Let's drop the row for now, on the assumption we'll receive a # Let's drop the row for now, on the assumption we'll receive a
# `POSITION` soon and we'll catch up correctly then. # `POSITION` soon and we'll catch up correctly then.
logger.info( logger.debug(
"Discarding RDATA for unconnected stream %s -> %s", "Discarding RDATA for unconnected stream %s -> %s",
stream_name, stream_name,
cmd.token, cmd.token,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment