diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-27 15:46:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 15:46:53 +0100 |
| commit | f87b287291067924f02d1f90ac1a423a52b6290e (patch) | |
| tree | ee3637d382484ee426b05912dabf3385e6a10c71 /synapse/app | |
| parent | Merge pull request #2131 from matthewjwolff/develop (diff) | |
| parent | synctl.py: Check if synapse is already running (diff) | |
| download | synapse-f87b287291067924f02d1f90ac1a423a52b6290e.tar.xz | |
Merge pull request #2127 from APwhitehat/alreadystarted
print something legible if synapse already running
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/synctl.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py index 8223734845..3bd7ef7bba 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py @@ -234,6 +234,9 @@ def main(): if action == "start" or action == "restart": if start_stop_synapse: + # Check if synapse is already running + if os.path.exists(pidfile) and pid_running(int(open(pidfile).read())): + abort("synapse.app.homeserver already running") start(configfile) for worker in workers: |