Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Correctly await on_logged_out callbacks #11786

Merged
merged 6 commits into from
Jan 20, 2022
Merged

Correctly await on_logged_out callbacks #11786

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
517f03d
Correctly await on_logged_out callbacks
babolivier Jan 20, 2022
b22989d
Changelog
babolivier Jan 20, 2022
31ae2c8
Add test
babolivier Jan 20, 2022
6bf3b62
Lint
babolivier Jan 20, 2022
556d9eb
Fix tests
babolivier Jan 20, 2022
9e974cf
Lint
babolivier Jan 20, 2022
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/11786.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.46.0 that prevented `on_logged_out` module callbacks from being correctly awaited by Synapse.
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion synapse/handlers/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2281,7 +2281,7 @@ async def on_logged_out(
# call all of the on_logged_out callbacks
for callback in self.on_logged_out_callbacks:
try:
callback(user_id, device_id, access_token)
await callback(user_id, device_id, access_token)
Copy link
Contributor

Choose a reason for hiding this comment

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

Argh are there any tests of the module API which could/should have caught this?

Related: python/mypy#2499, https://bugs.python.org/issue30491

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm good point, I'll add a test for this

except Exception as e:
logger.warning("Failed to run module API callback %s: %s", callback, e)
continue