summary refs log tree commit diff
path: root/synapse_topology
diff options
context:
space:
mode:
authorJorik Schellekens <joriks@matrix.org>2019-08-28 17:41:16 +0100
committerJorik Schellekens <joriks@matrix.org>2019-08-28 17:41:16 +0100
commit997fe300871f564b51f705f7c76dae6427b704a0 (patch)
treebee90c6818052fff35dea83afc7653069a81a12e /synapse_topology
parentHandle synapse start failure correctly (diff)
downloadsynapse-997fe300871f564b51f705f7c76dae6427b704a0.tar.xz
Handle synapse start correctly
Diffstat (limited to 'synapse_topology')
-rw-r--r--synapse_topology/server/server.py1
-rw-r--r--synapse_topology/webui/src/js/actions/index.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/synapse_topology/server/server.py b/synapse_topology/server/server.py
index 4d7be1e81f..b3f5dbaf8b 100644
--- a/synapse_topology/server/server.py
+++ b/synapse_topology/server/server.py
@@ -93,7 +93,6 @@ class Server:
     def start_synapse(self, request):
         print("Starting synapse")
         subprocess.check_output(["synctl", "start", self.model.config_dir])
-        sys.exit()
 
     @app.route("/favicon.ico")
     def noop(self, request):
diff --git a/synapse_topology/webui/src/js/actions/index.js b/synapse_topology/webui/src/js/actions/index.js
index 32d38ebc19..7aa69df9f5 100644
--- a/synapse_topology/webui/src/js/actions/index.js
+++ b/synapse_topology/webui/src/js/actions/index.js
@@ -291,7 +291,7 @@ export const writeConfig = (callback) => {
             .then(
                 res => startSynapse().then(
                     res => {
-                        if (Response.ok) {
+                        if (res.ok) {
 
                             dispatch(advanceUI());
                             callback();