Skip to content

gmoccapy: exit cleanly on termination signal instead of error dialog #4076

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

Open
grandixximo wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

gmoccapy: exit cleanly on termination signal instead of error dialog #4076

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
14 changes: 12 additions & 2 deletions src/emc/usr_intf/gmoccapy/gmoccapy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,20 @@

# Throws up a dialog with debug info when an error is encountered
def excepthook(exc_type, exc_obj, exc_tb):
# A KeyboardInterrupt reaching the excepthook is a termination request:
# either SIGINT, or SIGTERM surfaced into the main loop by PyGObject's
# signal bridge. Quit cleanly instead of popping a modal error dialog,
# which would block in a nested loop and leave gmoccapy running until the
# caller escalates to SIGKILL.
if issubclass(exc_type, KeyboardInterrupt):
LOG.info("gmoccapy interrupted (signal), shutting down")
try:
Gtk.main_quit()
except Exception:
pass
return
try:
w = app.widgets.window1
except KeyboardInterrupt:
sys.exit()
except NameError:
w = None
lines = traceback.format_exception(exc_type, exc_obj, exc_tb)
Expand Down
Loading