summary refs log tree commit diff
diff options
context:
space:
mode:
authorJorik Schellekens <joriks@matrix.org>2019-09-12 15:56:01 +0100
committerJorik Schellekens <joriks@matrix.org>2019-09-12 15:56:01 +0100
commit52135531ccb65ef9f8722ece265380aefa4fa963 (patch)
treef82feed0f71ae3b6ddd13f799da65719dd163b03
parentFix error code indentations and handling (diff)
downloadsynapse-52135531ccb65ef9f8722ece265380aefa4fa963.tar.xz
How did I flip that again??
-rwxr-xr-xsynctl6
1 files changed, 4 insertions, 2 deletions
diff --git a/synctl b/synctl
index fbe0668eff..f1656eb96e 100755
--- a/synctl
+++ b/synctl
@@ -325,7 +325,8 @@ def main():
             if os.path.exists(pidfile) and pid_running(int(open(pidfile).read())):
                 abort("synapse.app.homeserver already running")
 
-            error |= start(configfile, bool(options.daemonize))
+            if not start(configfile, bool(options.daemonize)):
+                error = True
 
         for worker in workers:
             env = os.environ.copy()
@@ -336,7 +337,8 @@ def main():
             for cache_name, factor in iteritems(worker.cache_factors):
                 os.environ["SYNAPSE_CACHE_FACTOR_" + cache_name.upper()] = str(factor)
 
-            error |= start_worker(worker.app, configfile, worker.configfile)
+            if not start_worker(worker.app, configfile, worker.configfile):
+                error = True
 
             # Reset env back to the original
             os.environ.clear()