Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure terminal is restored at exit #1932

Merged
merged 1 commit into from
Nov 12, 2021
Merged

Ensure terminal is restored at exit #1932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions locust/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import socket
import sys
import time
import atexit

import gevent

Expand Down Expand Up @@ -411,6 +412,9 @@ def start_automatic_run():
)
)
input_listener_greenlet.link_exception(greenlet_exception_handler)
# ensure terminal is reset, even if there is an unhandled exception in locust or someone
# does something wild, like calling sys.exit() in the locustfile
atexit.register(input_listener_greenlet.kill, block=True)

if options.csv_prefix:
gevent.spawn(stats_csv_writer.stats_writer).link_exception(greenlet_exception_handler)
Expand Down Expand Up @@ -472,8 +476,5 @@ def sig_term_handler():
except KeyboardInterrupt:
pass
except Exception:
if input_listener_greenlet is not None:
input_listener_greenlet.kill(block=False)
time.sleep(0)
raise
shutdown()