From 443162e57724c34099215732eda690ea25cb1e4c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 19 Mar 2020 10:48:45 +0100
Subject: [PATCH] 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.
---
 changelog.d/7104.misc     | 1 +
 synapse/app/_base.py      | 1 +
 synapse/app/homeserver.py | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/7104.misc

diff --git a/changelog.d/7104.misc b/changelog.d/7104.misc
new file mode 100644
index 000000000000..ec5c004bbed0
--- /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 9ffd23c6df37..4d84f4595a58 100644
--- a/synapse/app/_base.py
+++ b/synapse/app/_base.py
@@ -276,6 +276,7 @@ def handle_sighup(*args, **kwargs):
         # 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 e0fdddfdc90d..f2b56a636f52 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -408,7 +408,6 @@ def start():
 
             _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.