From 3bd3707cb9615b5a9f7f7449ebe3ec495017ee9f Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 2 Oct 2020 11:05:29 +0100
Subject: [PATCH] Fix malformed log line in new federation "catch up" logic
(#8442)
---
changelog.d/8442.bugfix | 1 +
synapse/federation/sender/per_destination_queue.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 changelog.d/8442.bugfix
diff --git a/changelog.d/8442.bugfix b/changelog.d/8442.bugfix
new file mode 100644
index 0000000000..6f779a1de5
--- /dev/null
+++ b/changelog.d/8442.bugfix
@@ -0,0 +1 @@
+Fix malformed log line in new federation "catch up" logic.
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py
index 2657767fd1..bc99af3fdd 100644
--- a/synapse/federation/sender/per_destination_queue.py
+++ b/synapse/federation/sender/per_destination_queue.py
@@ -490,7 +490,7 @@ class PerDestinationQueue:
)
if logger.isEnabledFor(logging.INFO):
- rooms = (p.room_id for p in catchup_pdus)
+ rooms = [p.room_id for p in catchup_pdus]
logger.info("Catching up rooms to %s: %r", self._destination, rooms)
success = await self._transaction_manager.send_new_transaction(
--
GitLab