Skip to content

Fix indentation of sighup handler calling code #19060

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
merged 2 commits into from
Oct 14, 2025
+4 −3
Merged

Fix indentation of sighup handler calling code #19060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ba6bee
Fix indentation of sighup handler calling code
anoadragon453 Oct 14, 2025
f1b9fa8
newsfile
anoadragon453 Oct 14, 2025
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/19060.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in 1.136.0 that would prevent Synapse from being able to be `reload`-ed more than once when running under systemd.
Copy link
Contributor

@MadLittleMods MadLittleMods Oct 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is there a way we can add a test for this? To prevent future breakage and ensure this behavior works into the future.

Perhaps our first out-of-repo Complement test that lives in the Synapse project. For example, we already do SIGHUP stuff in the SBG Complement tests.

Copy link
Member Author

Choose a reason for hiding this comment

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

I see no reason not to do that, though it would be a good amount of work to set up the CI and write such a test.

6 changes: 3 additions & 3 deletions synapse/app/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,9 +591,9 @@ async def _handle_sighup(*args: Any, **kwargs: Any) -> None:
# we're not using systemd.
sdnotify(b"RELOADING=1")

for sighup_callbacks in _instance_id_to_sighup_callbacks_map.values():
for func, args, kwargs in sighup_callbacks:
func(*args, **kwargs)
for sighup_callbacks in _instance_id_to_sighup_callbacks_map.values():
for func, args, kwargs in sighup_callbacks:
func(*args, **kwargs)

sdnotify(b"READY=1")

Expand Down
Loading