Merge pull request #665 from jnschulze/master

Exit with code 1 on greenlet exceptions
locustio · Oct 21, 2019 · 24e0a8e · 24e0a8e
2 parents 5c7f264 + 0f2338a
commit 24e0a8e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/locust/main.py b/locust/main.py
@@ -516,7 +516,7 @@ def sig_term_handler():
         logger.info("Starting Locust %s" % version)
         main_greenlet.join()
         code = 0
-        if len(runners.locust_runner.errors):
+        if len(runners.locust_runner.errors) or main_greenlet.exception:
             code = options.exit_code_on_error
         shutdown(code=code)
     except KeyboardInterrupt as e: