summary refs log tree commit diff
path: root/docker/start.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-20 12:14:19 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-20 12:14:19 +0100
commit8569f3cdefc6e4bf023ab9daa594af315b3bc87f (patch)
tree47b8084042c2309efc7b60e78705c28734022cd9 /docker/start.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentFix exception when resetting retry timings (diff)
downloadsynapse-8569f3cdefc6e4bf023ab9daa594af315b3bc87f.tar.xz
Merge branch 'rav/fix_retry_reset' into matrix-org-hotfixes
Diffstat (limited to 'docker/start.py')
-rwxr-xr-xdocker/start.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/start.py b/docker/start.py

index 260f2d9943..e41ea20e70 100755 --- a/docker/start.py +++ b/docker/start.py
@@ -182,6 +182,7 @@ def main(args, environ): mode = args[1] if len(args) > 1 else None desired_uid = int(environ.get("UID", "991")) desired_gid = int(environ.get("GID", "991")) + synapse_worker = environ.get("SYNAPSE_WORKER", "synapse.app.homeserver") if (desired_uid == os.getuid()) and (desired_gid == os.getgid()): ownership = None else: @@ -245,7 +246,7 @@ def main(args, environ): log("Starting synapse with config file " + config_path) - args = ["python", "-m", "synapse.app.homeserver", "--config-path", config_path] + args = ["python", "-m", synapse_worker, "--config-path", config_path] if ownership is not None: args = ["su-exec", ownership] + args os.execv("/sbin/su-exec", args)