summary refs log tree commit diff
path: root/synapse/app/synctl.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-09 19:18:09 +0100
committerMark Haines <mark.haines@matrix.org>2015-10-09 19:18:09 +0100
commitaf7b21447648cba477542bc1786be2a6c0928e37 (patch)
tree74c4481acd515a180c0edeb05d1a03b52ba30fd6 /synapse/app/synctl.py
parentFormat the presence events correctly for v2 (diff)
parentSplit the sections of EventStreamHandler.get_stream that handle presence (diff)
downloadsynapse-af7b21447648cba477542bc1786be2a6c0928e37.tar.xz
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
Diffstat (limited to 'synapse/app/synctl.py')
-rwxr-xr-xsynapse/app/synctl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py

index 1078d19b79..5d82beed0e 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py
@@ -32,9 +32,9 @@ def start(configfile): print "Starting ...", args = SYNAPSE args.extend(["--daemonize", "-c", configfile]) - cwd = os.path.dirname(os.path.abspath(__file__)) + try: - subprocess.check_call(args, cwd=cwd) + subprocess.check_call(args) print GREEN + "started" + NORMAL except subprocess.CalledProcessError as e: print (