summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-06 09:29:15 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-06 09:29:15 +0100
commit488a2696b695767cac3252f69371c4cf1dfb81e2 (patch)
tree19f77614085b14bfe67ef00b90ca9bb3f679acbc
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentmore verbosity in synctl (diff)
downloadsynapse-488a2696b695767cac3252f69371c4cf1dfb81e2.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
-rwxr-xr-xsynapse/app/synctl.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py

index 1ab1522657..8c525459c7 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py
@@ -262,6 +262,7 @@ def main(): for running_pid in running_pids: while pid_running(running_pid): time.sleep(0.2) + write("All processes exited; now restarting...") if action == "start" or action == "restart": if start_stop_synapse: