Skip to content

Move exception handling up the stack (avoid exit(1) in our composable functions) #19116

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
MadLittleMods merged 5 commits into from
Nov 3, 2025
Merged

Move exception handling up the stack (avoid exit(1) in our composable functions) #19116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7a9ff3
Move exception handling up the stack (avoid `exit(1)`)
MadLittleMods Oct 30, 2025
d555d42
Add changelog
MadLittleMods Oct 30, 2025
0045de9
Merge branch 'develop' into madlittlemods/handle-startup-exception-in…
MadLittleMods Oct 30, 2025
5df4a95
Merge branch 'develop' into madlittlemods/handle-startup-exception-in…
MadLittleMods Oct 31, 2025
7fb1b99
Merge branch 'develop' into madlittlemods/handle-startup-exception-in…
anoadragon453 Nov 3, 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/19116.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move exception handling up the stack (avoid `exit(1)` in our composable functions).
16 changes: 8 additions & 8 deletions synapse/app/generic_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,14 +364,11 @@ def start(config: HomeServerConfig) -> None:
# Start the tracer
init_tracer(hs) # noqa

try:
hs.setup()
hs.setup()

# Ensure the replication streamer is always started in case we write to any
# streams. Will no-op if no streams can be written to by this worker.
hs.get_replication_streamer()
except Exception as e:
handle_startup_exception(e)
# Ensure the replication streamer is always started in case we write to any
# streams. Will no-op if no streams can be written to by this worker.
hs.get_replication_streamer()

async def start() -> None:
await _base.start(hs)
Expand All @@ -388,7 +385,10 @@ async def start() -> None:
def main() -> None:
homeserver_config = load_config(sys.argv[1:])
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
start(homeserver_config)
try:
start(homeserver_config)
except Exception as e:
handle_startup_exception(e)


if __name__ == "__main__":
Expand Down
10 changes: 5 additions & 5 deletions synapse/app/homeserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,7 @@ def setup(
# Start the tracer
init_tracer(hs) # noqa

try:
hs.setup()
except Exception as e:
handle_startup_exception(e)
hs.setup()

async def _start_when_reactor_running() -> None:
# TODO: Feels like this should be moved somewhere else.
Expand Down Expand Up @@ -464,7 +461,10 @@ def main() -> None:
# check base requirements
check_requirements()
hs = create_homeserver(homeserver_config)
setup(hs)
try:
setup(hs)
except Exception as e:
handle_startup_exception(e)

# redirect stdio to the logs, if configured.
if not hs.config.logging.no_redirect_stdio:
Expand Down