Fix exit codes

1 files changed, 21 insertions, 2 deletions

diff --git a/synctl b/synctl
index a9629cf0e8..2470de5f17 100755
--- a/synctl
+++ b/synctl
@@ -88,6 +88,7 @@ def start(configfile, daemonize=True):
             "error starting (exit code: %d); see above for logs" % e.returncode,
             colour=RED,
         )
+        raise
 
 
 def start_worker(app, configfile, worker_configfile):
@@ -102,6 +103,7 @@ def start_worker(app, configfile, worker_configfile):
             % (app, worker_configfile, e.returncode),
             colour=RED,
         )
+        raise
 
 
 def stop(pidfile, app):
@@ -292,11 +294,20 @@ def main():
             write("All processes exited; now restarting...")
 
     if action == "start" or action == "restart":
+        error = False
         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, bool(options.daemonize))
+            try:
+                start(configfile, bool(options.daemonize))
+            except subprocess.CalledProcessError:
+                error = True
+
+        # If we're only trying to start synapse and it blew up we can safely
+        # return a non-zero exit code.
+        if not workers:
+            exit(1)
 
         for worker in workers:
             env = os.environ.copy()
@@ -307,12 +318,20 @@ def main():
             for cache_name, factor in iteritems(worker.cache_factors):
                 os.environ["SYNAPSE_CACHE_FACTOR_" + cache_name.upper()] = str(factor)
 
-            start_worker(worker.app, configfile, worker.configfile)
+            try:
+                start_worker(worker.app, configfile, worker.configfile)
+            except subprocess.CalledProcessError:
+                error = True
 
             # Reset env back to the original
             os.environ.clear()
             os.environ.update(env)
 
+        # If we only tried to start one worker and it blew up we can safely return
+        # a non-zero exit code.
+        if error and len(workers) == 1 and not start_stop_synapse:
+            exit(1)
+
 
 if __name__ == "__main__":
     main()