From 8d7c0201456b7f9af6e91fea90354f4c3de323fe Mon Sep 17 00:00:00 2001 From: Satoshi Fujii Date: Fri, 22 Oct 2021 12:30:45 +0000 Subject: Fix log rotation issue Writing log to a single file from multiple processes is not supported by python logging. It causes making fragmented log files at log rotation and logs are mixed up. This change is to use different log files for each sub-process to help developers check log for a specific process easily. This change does not affect to pod log (stdout log). Signed-off-by: Satoshi Fujii Issue-ID: DCAEGEN2-2941 Change-Id: If8bcb2308863d1395a2c547d2e7b746301665fb0 --- tests/test_get_logger.py | 36 ++++++++++++++++++++++-------------- tests/test_trapd_vnf_table.py | 5 ++--- 2 files changed, 24 insertions(+), 17 deletions(-) (limited to 'tests') diff --git a/tests/test_get_logger.py b/tests/test_get_logger.py index a643e0f..cbef9c6 100644 --- a/tests/test_get_logger.py +++ b/tests/test_get_logger.py @@ -1,5 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright 2021 Fujitsu Ltd. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,23 +14,30 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +import logging +import os +from pathlib import Path from miss_htbt_service import get_logger -import os +log = logging.getLogger(__name__) + -def test_get_logger(): - try: - os.remove("hb_logs.txt") - except: - pass - log = get_logger.get_logger() +def test_configure_logger(): + expected_log_path = Path('./hb_logs.txt') + if expected_log_path.exists(): + os.remove(expected_log_path) + get_logger.configure_logger('') log.info("hi there") + assert expected_log_path.exists() + os.remove(expected_log_path) -def test_get_logger_node(): - try: - os.remove("hb_logs.txt") - except: - pass - log = get_logger.get_logger("node") - log.info("hi there node") + +def test_configure_logger_with_name(): + expected_log_path = Path('./hb_htbtworker_logs.txt') + if expected_log_path.exists(): + os.remove(expected_log_path) + get_logger.configure_logger('htbtworker') + log.info("hi there") + assert expected_log_path.exists() + os.remove(expected_log_path) diff --git a/tests/test_trapd_vnf_table.py b/tests/test_trapd_vnf_table.py index 2110324..e8ef5d0 100644 --- a/tests/test_trapd_vnf_table.py +++ b/tests/test_trapd_vnf_table.py @@ -23,9 +23,8 @@ """ test_trapd_vnf_table contains test cases related to DB Tables and cbs polling. """ - +import logging import unittest -import get_logger from mod.trapd_vnf_table import ( verify_DB_creation_1, verify_DB_creation_2, verify_DB_creation_hb_common, hb_properties, verify_cbspolling, @@ -34,7 +33,7 @@ from mod.trapd_vnf_table import ( verify_fetch_json_file, verify_misshtbtdmain, verify_dbmonitoring, verify_dbmon_startup) -_logger = get_logger.get_logger(__name__) +_logger = logging.getLogger(__name__) class test_vnf_tables(unittest.TestCase): -- cgit 1.2.3-korg