diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-06 12:56:35 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-06 12:56:47 +0100 |
| commit | b994fb2b965debb59249696ab15e1fdabb5f1f2f (patch) | |
| tree | f5c119b92751f1aeba1d8e7419a6853bec314936 | |
| parent | Merge pull request #140 from matrix-org/erikj/scripts_refactor (diff) | |
| download | synapse-b994fb2b965debb59249696ab15e1fdabb5f1f2f.tar.xz | |
Don't read from the config file before checking it exists
| -rwxr-xr-x | synapse/app/synctl.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py index 0a2b0d6fcd..1f7d543c31 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py @@ -27,20 +27,21 @@ CONFIGFILE = "homeserver.yaml" GREEN = "\x1b[1;32m" NORMAL = "\x1b[m" +if not os.path.exists(CONFIGFILE): + sys.stderr.write( + "No config file found\n" + "To generate a config file, run '%s -c %s --generate-config" + " --server-name=<server name>'\n" % ( + " ".join(SYNAPSE), CONFIGFILE + ) + ) + sys.exit(1) + CONFIG = yaml.load(open(CONFIGFILE)) PIDFILE = CONFIG["pid_file"] def start(): - if not os.path.exists(CONFIGFILE): - sys.stderr.write( - "No config file found\n" - "To generate a config file, run '%s -c %s --generate-config" - " --server-name=<server name>'\n" % ( - " ".join(SYNAPSE), CONFIGFILE - ) - ) - sys.exit(1) print "Starting ...", args = SYNAPSE args.extend(["--daemonize", "-c", CONFIGFILE]) |