Skip to content

Fix exception when failing to talk to remote server #17411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erikjohnston merged 3 commits into from
Jul 9, 2024
Merged

Fix exception when failing to talk to remote server #17411

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2415b3b
Fix exception when failing to talk to remote server
erikjohnston Jul 8, 2024
79a4bd8
Newsfile
erikjohnston Jul 8, 2024
b58367a
Remove pending_pdus
erikjohnston Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/17411.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix linting errors from new `ruff` version.
4 changes: 3 additions & 1 deletion synapse/federation/sender/per_destination_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ def attempt_new_transaction(self) -> None:
)

async def _transaction_transmission_loop(self) -> None:
pending_pdus: List[EventBase] = []
try:
self.transmission_loop_running = True

Expand All @@ -337,11 +338,12 @@ async def _transaction_transmission_loop(self) -> None:
# not caught up yet
return

pending_pdus = []
Copy link
Copy Markdown
Member

@sandhose sandhose Jul 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this reassignment necessary, we're not in a loop and haven't modified this variable yet?

Copy link
Copy Markdown
Member Author

@erikjohnston erikjohnston Jul 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was what it was previously, I just basically reverted this file. Have removed it.

while True:
self._new_data_to_send = False

async with _TransactionQueueManager(self) as (
pending_pdus,
pending_pdus, # noqa: F811
pending_edus,
):
if not pending_pdus and not pending_edus:
Expand Down