diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-03-19 10:48:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 09:48:45 +0000 |
| commit | 443162e57724c34099215732eda690ea25cb1e4c (patch) | |
| tree | 49407854e702ec4feb98d7c1e7ecc202e0e4a3c9 | |
| parent | Improve get auth chain difference algorithm. (#7095) (diff) | |
| download | synapse-443162e57724c34099215732eda690ea25cb1e4c.tar.xz | |
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.
| -rw-r--r-- | changelog.d/7104.misc | 1 | ||||
| -rw-r--r-- | synapse/app/_base.py | 1 | ||||
| -rw-r--r-- | synapse/app/homeserver.py | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/7104.misc b/changelog.d/7104.misc new file mode 100644 index 0000000000..ec5c004bbe --- /dev/null +++ b/changelog.d/7104.misc @@ -0,0 +1 @@ +Merge worker apps together. diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 9ffd23c6df..4d84f4595a 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -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) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e0fdddfdc9..f2b56a636f 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -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. |