Merge branch 'develop' of github.com:matrix-org/synapse into erikj/separate_event_creation github/erikj/separate_event_creation erikj/separate_event_creation

1 files changed, 5 insertions, 0 deletions

diff --git a/synapse/config/workers.py b/synapse/config/workers.py

index c5a5a8919c..4b6884918d 100644
--- a/synapse/config/workers.py
+++ b/synapse/config/workers.py
@@ -23,6 +23,11 @@ class WorkerConfig(Config):
 
     def read_config(self, config):
         self.worker_app = config.get("worker_app")
+
+        # Canonicalise worker_app so that master always has None
+        if self.worker_app == "synapse.app.homeserver":
+            self.worker_app = None
+
         self.worker_listeners = config.get("worker_listeners")
         self.worker_daemonize = config.get("worker_daemonize")
         self.worker_pid_file = config.get("worker_pid_file")