openstack/swift
Code Issues Proposed changes

swift-ring-builder: exit ERROR (2) on uncaught exceptions

Browse Source 
swift-ring-builder has three exit statuses: 0 (OK), 1 (WARNING),
2 (ERROR). Uncaught exceptions in python result in an exit code of 1,
so for example problems writing a builder file to disk will result in
an exit of 1 (warning) rather than 2 (error).

This addresses that by overriding sys.excepthook to produce the usual
backtrace and then exit 2 (error); excepthook is called when an
exception is unhandled, unless that is SystemExit.

Closes-Bug: 1960657
Change-Id: I7cfeff4f436ade319cf21d0d29853931aef6d20f
This commit is contained in:
Matthew Vernon 2022-02-14 14:14:27 +00:00
parent 975d3dbcfe
commit 89ee843080
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/swift-ring-builder
View File

@ -16,9 +16,22 @@
import sys import sys
import traceback
# We exit code 1 on WARNING statuses, 2 on ERROR. This means we need
# to handle any uncaught exceptions by printing the usual backtrace,
# but then exiting 2 (not 1 as is usual for a python
# exception).
def exit_with_status_two(tp, val, tb):
traceback.print_exception(tp, val, tb)
sys.exit(2)
sys.excepthook = exit_with_status_two
from swift.cli.ringbuilder import main from swift.cli.ringbuilder import main
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())