From 9d98eb6b606b40fa26aad12786894d1a99cb726c Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 28 Jun 2021 19:06:09 +0200 Subject: [PATCH] renaming logging functions --- config/custom_mode_op.py | 4 ++-- config/globals_config.py | 4 ++-- pus_tc/tc_packer_hook.py | 4 ++-- pus_tm/factory_hook.py | 4 ++-- pus_tm/hk_handling.py | 4 ++-- tmtccmd | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/custom_mode_op.py b/config/custom_mode_op.py index a82797b..159e350 100644 --- a/config/custom_mode_op.py +++ b/config/custom_mode_op.py @@ -6,9 +6,9 @@ import enum from tmtccmd.core.backend import TmTcHandler -from tmtccmd.utility.logger import get_logger +from tmtccmd.utility.logger import get_console_logger -LOGGER = get_logger() +LOGGER = get_console_logger() class CustomModeList(enum.IntEnum): diff --git a/config/globals_config.py b/config/globals_config.py index b8274bb..3fc9b35 100644 --- a/config/globals_config.py +++ b/config/globals_config.py @@ -14,9 +14,9 @@ from config.custom_mode_op import CustomModeList from tmtccmd.config.definitions import CoreComInterfaces from tmtccmd.config.globals import set_default_globals_pre_args_parsing, \ set_default_globals_post_args_parsing -from tmtccmd.utility.logger import get_logger +from tmtccmd.utility.logger import get_console_logger -LOGGER = get_logger() +LOGGER = get_console_logger() class CustomGlobalIds(enum.Enum): diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py index 41b572b..b1ee736 100644 --- a/pus_tc/tc_packer_hook.py +++ b/pus_tc/tc_packer_hook.py @@ -9,7 +9,7 @@ from collections import deque from typing import Union from tmtccmd.config.definitions import CoreServiceList -from tmtccmd.utility.logger import get_logger +from tmtccmd.utility.logger import get_console_logger from tmtccmd.pus_tc.definitions import TcQueueT from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into from tmtccmd.pus_tc.service_17_test import pack_service17_ping_command @@ -27,7 +27,7 @@ from config.object_ids import P60_DOCK_HANDLER, PDU_1_HANDLER_ID, PDU_2_HANDLER_ TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID, IMTQ_HANDLER_ID, PLOC_ID -LOGGER = get_logger() +LOGGER = get_console_logger() def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT): diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py index ab2b264..d1a2bac 100644 --- a/pus_tm/factory_hook.py +++ b/pus_tm/factory_hook.py @@ -5,7 +5,7 @@ """ from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM from tmtccmd.ecss.tm import PusTelemetry -from tmtccmd.utility.logger import get_logger +from tmtccmd.utility.logger import get_console_logger from tmtccmd.pus_tm.service_1_verification import Service1TM from tmtccmd.pus_tm.service_3_housekeeping import Service3TM @@ -15,7 +15,7 @@ from tmtccmd.utility.tmtc_printer import TmTcPrinter from config.definitions import PUS_APID -LOGGER = get_logger() +LOGGER = get_console_logger() def ccsds_tm_handler(apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter) -> None: diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py index f093ae7..681c8aa 100644 --- a/pus_tm/hk_handling.py +++ b/pus_tm/hk_handling.py @@ -8,11 +8,11 @@ import struct from typing import Tuple from tmtccmd.pus_tm.service_3_housekeeping import Service3Base -from tmtccmd.utility.logger import get_logger +from tmtccmd.utility.logger import get_console_logger from pus_tc.syrlinks_hk_handler import SetIds from pus_tc.imtq import ImtqSetIds from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID -LOGGER = get_logger() +LOGGER = get_console_logger() def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray, diff --git a/tmtccmd b/tmtccmd index e839281..742e73d 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit e83928127df3451171d8d5c22d8c2ca1d571d629 +Subproject commit 742e73dba0fbcad35768a268320c419854eab2ae