summary refs log tree commit diff
path: root/synapse/app/synctl.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-11-18 15:48:30 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-11-18 15:48:30 +0000
commite9f587ecbaf5b60183d7c56108d76bb5f76a98f4 (patch)
tree5cf7df273b613b88902016722ca8f2d1c222cf19 /synapse/app/synctl.py
parentInclude room members' presence in room initialSync (diff)
parentNull check when determining default power levels (diff)
downloadsynapse-e9f587ecbaf5b60183d7c56108d76bb5f76a98f4.tar.xz
Merge remote-tracking branch 'origin/develop' into room-initial-sync
Diffstat (limited to 'synapse/app/synctl.py')
-rwxr-xr-xsynapse/app/synctl.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py
index e85073b06b..abe055a64c 100755
--- a/synapse/app/synctl.py
+++ b/synapse/app/synctl.py
@@ -56,8 +56,8 @@ def main():
     elif action == "stop":
         stop()
     elif action == "restart":
-        start()
         stop()
+        start()
     else:
         sys.stderr.write("Usage: %s [start|stop|restart]\n" % (sys.argv[0],))
         sys.exit(1)