mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-15 05:03:51 +01:00
Move pusherpool startup into _base.setup (#7104)
This should be safe to do on all workers/masters because it is guarded by a config option which will ensure it is only actually done on the worker assigned as a pusher.
This commit is contained in:
parent
4a17a647a9
commit
443162e577
3 changed files with 2 additions and 1 deletions
1
changelog.d/7104.misc
Normal file
1
changelog.d/7104.misc
Normal file
|
@ -0,0 +1 @@
|
|||
Merge worker apps together.
|
|
@ -276,6 +276,7 @@ def start(hs, listeners=None):
|
|||
# It is now safe to start your Synapse.
|
||||
hs.start_listening(listeners)
|
||||
hs.get_datastore().db.start_profiling()
|
||||
hs.get_pusherpool().start()
|
||||
|
||||
setup_sentry(hs)
|
||||
setup_sdnotify(hs)
|
||||
|
|
|
@ -408,7 +408,6 @@ def setup(config_options):
|
|||
|
||||
_base.start(hs, config.listeners)
|
||||
|
||||
hs.get_pusherpool().start()
|
||||
hs.get_datastore().db.updates.start_doing_background_updates()
|
||||
except Exception:
|
||||
# Print the exception and bail out.
|
||||
|
|
Loading…
Reference in a new issue