From e7b0e3293d37e4e80b4f8af952f7955acdf11a6a Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 25 Oct 2024 06:34:46 +0200 Subject: [PATCH] feat: Exit with exception, not with exit1 this aligns to how other parts of the code work - leaving "exit" to the outermost caller. --- freqtrade/loggers/__init__.py | 4 +--- tests/test_log_setup.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/freqtrade/loggers/__init__.py b/freqtrade/loggers/__init__.py index 65162cb0e..7e18d3cba 100644 --- a/freqtrade/loggers/__init__.py +++ b/freqtrade/loggers/__init__.py @@ -1,5 +1,4 @@ import logging -import sys from logging import Formatter from logging.handlers import RotatingFileHandler, SysLogHandler from pathlib import Path @@ -97,7 +96,7 @@ def setup_logging(config: Config) -> None: backupCount=10, ) except PermissionError: - logger.error( + raise OperationalException( f'Failed to create or access log file "{logfile_path.absolute()}". ' "Please make sure you have the write permission to the log file or its parent " "directories. If you're running freqtrade using docker, you see this error " @@ -105,7 +104,6 @@ def setup_logging(config: Config) -> None: "non-root user, delete and recreate the directories you need, and then try " "again." ) - sys.exit(1) handler_rf.setFormatter(Formatter(LOGFORMAT)) logging.root.addHandler(handler_rf) diff --git a/tests/test_log_setup.py b/tests/test_log_setup.py index e9cd8c342..ec267c85e 100644 --- a/tests/test_log_setup.py +++ b/tests/test_log_setup.py @@ -121,9 +121,8 @@ def test_set_loggers_Filehandler_without_permission(tmp_path): } setup_logging_pre() - with pytest.raises(SystemExit) as excinfo: + with pytest.raises(OperationalException): setup_logging(config) - assert excinfo.value.code == 1 logger.handlers = orig_handlers