Skip to content

Commit

Permalink
Merge pull request locustio#1115 from locustio/revert-665-master
Browse files Browse the repository at this point in the history
Revert "Exit with code 1 on greenlet exceptions"
  • Loading branch information
heyman authored Oct 22, 2019
2 parents e598724 + 71ed9dd commit 64f96aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion locust/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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) or main_greenlet.exception:
if len(runners.locust_runner.errors):
code = options.exit_code_on_error
shutdown(code=code)
except KeyboardInterrupt as e:
Expand Down

0 comments on commit 64f96aa

Please sign in to comment.