From 6d4245dfd91b02382fb229400cc6a6400d341480 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Tue, 18 Apr 2017 12:05:05 +0200 Subject: [PATCH] Set error log file according to user given setting --- bigchaindb/log/setup.py | 6 +++++- tests/log/test_setup.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bigchaindb/log/setup.py b/bigchaindb/log/setup.py index f3e8f7a3..b6b45b00 100644 --- a/bigchaindb/log/setup.py +++ b/bigchaindb/log/setup.py @@ -49,7 +49,7 @@ def setup_logging(*, user_log_config=None): setup_sub_logger(user_log_config=user_log_config) -def create_subscriber_logging_config(*, user_log_config=None): +def create_subscriber_logging_config(*, user_log_config=None): # noqa: C901 sub_log_config = deepcopy(SUBSCRIBER_LOGGING_CONFIG) if not user_log_config: @@ -59,6 +59,10 @@ def create_subscriber_logging_config(*, user_log_config=None): filename = user_log_config['file'] sub_log_config['handlers']['file']['filename'] = filename + if 'error_file' in user_log_config: + error_filename = user_log_config['error_file'] + sub_log_config['handlers']['errors']['filename'] = error_filename + if 'level_console' in user_log_config: level = _normalize_log_level(user_log_config['level_console']) sub_log_config['handlers']['console']['level'] = level diff --git a/tests/log/test_setup.py b/tests/log/test_setup.py index 39a55995..0e608d26 100644 --- a/tests/log/test_setup.py +++ b/tests/log/test_setup.py @@ -137,6 +137,7 @@ def test_create_subscriber_logging_config_with_user_given_config(): SUBSCRIBER_LOGGING_CONFIG as expected_log_config) user_log_config = { 'file': '/var/log/bigchaindb/bdb.log', + 'error_file': '/var/log/bigchaindb/bdb-err.log', 'level_console': 'warning', 'level_logfile': 'info', 'fmt_console': '[%(levelname)s] (%(name)s) %(message)s', @@ -167,7 +168,10 @@ def test_create_subscriber_logging_config_with_user_given_config(): user_log_config['level_console'].upper()) assert (config['handlers']['file']['level'] == user_log_config['level_logfile'].upper()) + assert config['handlers']['errors']['level'] == logging.ERROR assert config['handlers']['file']['filename'] == user_log_config['file'] + assert (config['handlers']['errors']['filename'] == + user_log_config['error_file']) del config['handlers']['console']['level'] del config['handlers']['file']['level'] del config['handlers']['file']['filename']