starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 02:35:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

log: Don't print backtrace on ^c/KeyboardInterrupt (#8259)

Browse Source
This commit is contained in:
alexzorin
2020-09-04 12:57:46 +02:00
committed by GitHub
parent 3ce87d1fcb
commit 98615564ed
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/certbot/_internal/log.py
+3
View File
@@ -319,6 +319,9 @@ def post_arg_parse_except_hook(exc_type, exc_value, trace, debug, log_path):
# logger.DEBUG should be used # logger.DEBUG should be used
if debug or not issubclass(exc_type, Exception): if debug or not issubclass(exc_type, Exception):
assert constants.QUIET_LOGGING_LEVEL <= logging.ERROR assert constants.QUIET_LOGGING_LEVEL <= logging.ERROR
if exc_type is KeyboardInterrupt:
logger.error('Exiting due to user request.')
sys.exit(1)
logger.error('Exiting abnormally:', exc_info=exc_info) logger.error('Exiting abnormally:', exc_info=exc_info)
else: else:
logger.debug('Exiting abnormally:', exc_info=exc_info) logger.debug('Exiting abnormally:', exc_info=exc_info)
certbot/tests/log_test.py
+6 -1
View File
@@ -306,7 +306,7 @@ class PostArgParseExceptHookTest(unittest.TestCase):
self.log_path = 'foo.log' self.log_path = 'foo.log'
def test_base_exception(self): def test_base_exception(self):
exc_type = KeyboardInterrupt exc_type = BaseException
mock_logger, output = self._test_common(exc_type, debug=False) mock_logger, output = self._test_common(exc_type, debug=False)
self._assert_exception_logged(mock_logger.error, exc_type) self._assert_exception_logged(mock_logger.error, exc_type)
self._assert_logfile_output(output) self._assert_logfile_output(output)
@@ -342,6 +342,11 @@ class PostArgParseExceptHookTest(unittest.TestCase):
self._assert_exception_logged(mock_logger.debug, exc_type) self._assert_exception_logged(mock_logger.debug, exc_type)
self._assert_quiet_output(mock_logger, output) self._assert_quiet_output(mock_logger, output)
def test_keyboardinterrupt(self):
exc_type = KeyboardInterrupt
mock_logger, output = self._test_common(exc_type, debug=False)
mock_logger.error.assert_called_once_with('Exiting due to user request.')
def _test_common(self, error_type, debug): def _test_common(self, error_type, debug):
"""Returns the mocked logger and stderr output.""" """Returns the mocked logger and stderr output."""
mock_err = six.StringIO() mock_err = six.StringIO()