summary refs log tree commit diff
path: root/synapse/config/workers.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-23 09:20:26 +0100
committerErik Johnston <erik@matrix.org>2019-07-23 09:20:26 +0100
commitc02f26319dbe03e6766980796d6a24f5d054b06f (patch)
tree7a50e20396132d3af5c73930607a0f1d740ea108 /synapse/config/workers.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentFix logging in workers (#5729) (diff)
downloadsynapse-c02f26319dbe03e6766980796d6a24f5d054b06f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/workers.py')
-rw-r--r--synapse/config/workers.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py

index 246d72cd61..bc0fc165e3 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py
@@ -31,6 +31,7 @@ class WorkerConfig(Config): self.worker_listeners = config.get("worker_listeners", []) self.worker_daemonize = config.get("worker_daemonize") self.worker_pid_file = config.get("worker_pid_file") + self.worker_log_config = config.get("worker_log_config") # The host used to connect to the main synapse self.worker_replication_host = config.get("worker_replication_host", None)