diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-07 19:07:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-07 19:07:00 +0100 |
| commit | 89c0cd4accbf6d809cc9d3fdce4df4d8e4f39d35 (patch) | |
| tree | 019dd15780bbd432e099c748fecd2a16b645b470 /synapse/app/synctl.py | |
| parent | Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 (diff) | |
| parent | Slight rewording (diff) | |
| download | synapse-89c0cd4accbf6d809cc9d3fdce4df4d8e4f39d35.tar.xz | |
Merge branch 'release-v0.9.0' of github.com:matrix-org/synapse v0.9.0
Diffstat (limited to 'synapse/app/synctl.py')
| -rwxr-xr-x | synapse/app/synctl.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py index 3a70a248dc..0a2b0d6fcd 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py @@ -18,15 +18,18 @@ import sys import os import subprocess import signal +import yaml SYNAPSE = ["python", "-B", "-m", "synapse.app.homeserver"] CONFIGFILE = "homeserver.yaml" -PIDFILE = "homeserver.pid" GREEN = "\x1b[1;32m" NORMAL = "\x1b[m" +CONFIG = yaml.load(open(CONFIGFILE)) +PIDFILE = CONFIG["pid_file"] + def start(): if not os.path.exists(CONFIGFILE): @@ -40,7 +43,7 @@ def start(): sys.exit(1) print "Starting ...", args = SYNAPSE - args.extend(["--daemonize", "-c", CONFIGFILE, "--pid-file", PIDFILE]) + args.extend(["--daemonize", "-c", CONFIGFILE]) subprocess.check_call(args) print GREEN + "started" + NORMAL |