swift/bin/swift-ring-builder
Matthew Vernon 89ee843080 swift-ring-builder: exit ERROR (2) on uncaught exceptions
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
2022-02-15 14:29:14 +00:00

38 lines
1.1 KiB
Python
Executable File

#!/usr/bin/env python
# Copyright (c) 2014 Christian Schwede <christian.schwede@enovance.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
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
if __name__ == "__main__":
sys.exit(main())