Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion synapse/config/workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,10 @@ def read_config(
)
self.worker_replication_secret = worker_replication_secret

self.worker_name = config.get("worker_name", self.worker_app)
from os import environ
self.worker_name = self.worker_app
if self.worker_app:
self.worker_name = config.get("worker_name", environ.get("HOSTNAME"))
self.instance_name = self.worker_name or MAIN_PROCESS_INSTANCE_NAME

# FIXME: Remove this check after a suitable amount of time.
Expand Down