summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-21 15:12:31 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 15:12:31 +0100
commit56e24772189df8b554313f5921c1b3c4740f609a (patch)
tree6fb964752eed8d7c63709cbf9b0071331fafdbf5 /synapse/federation
parentMerge commit 'cc40a59b4' into anoa/dinsic_release_1_21_x (diff)
parent1.21.0rc2 (diff)
downloadsynapse-56e24772189df8b554313f5921c1b3c4740f609a.tar.xz
Merge commit '6a8fd03ac' into anoa/dinsic_release_1_21_x
* commit '6a8fd03ac':
  1.21.0rc2
  1.21.0rc2
  Fix bug in remote thumbnail search (#8438)
  Fix DB query on startup for negative streams. (#8447)
  Convert additional templates to Jinja (#8444)
  Fix malformed log line in new federation "catch up" logic (#8442)
  Do not expose the experimental appservice login flow to clients. (#8440)
  update changelog
  fix a logging error in thumbnailer (#8435)
  changelog fixes
  fix version number
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/sender/per_destination_queue.py2
1 files changed, 1 insertions, 1 deletions
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(