diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-01-11 15:55:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 15:55:05 +0000 |
| commit | 671138f6585d77f7577c7809a220555f54b09536 (patch) | |
| tree | f736c4a36045a60b36e2e8887960074d4f6f7298 /synapse/app/generic_worker.py | |
| parent | Remove old tables after schema version bump (#9055) (diff) | |
| download | synapse-671138f6585d77f7577c7809a220555f54b09536.tar.xz | |
Clean up exception handling in the startup code (#9059)
Factor out the exception handling in the startup code to a utility function, and fix the some logging and exit code stuff.
Diffstat (limited to 'synapse/app/generic_worker.py')
| -rw-r--r-- | synapse/app/generic_worker.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 4428472707..a57535989a 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -21,7 +21,7 @@ from typing import Dict, Iterable, Optional, Set from typing_extensions import ContextManager -from twisted.internet import address, reactor +from twisted.internet import address import synapse import synapse.events @@ -34,6 +34,7 @@ from synapse.api.urls import ( SERVER_KEY_V2_PREFIX, ) from synapse.app import _base +from synapse.app._base import register_start from synapse.config._base import ConfigError from synapse.config.homeserver import HomeServerConfig from synapse.config.logger import setup_logging @@ -960,9 +961,7 @@ def start(config_options): # streams. Will no-op if no streams can be written to by this worker. hs.get_replication_streamer() - reactor.addSystemEventTrigger( - "before", "startup", _base.start, hs, config.worker_listeners - ) + register_start(_base.start, hs, config.worker_listeners) _base.start_worker_reactor("synapse-generic-worker", config) |