diff --git a/src/drunc/controller/controller.py b/src/drunc/controller/controller.py index c579fa01c..a244e4b7d 100644 --- a/src/drunc/controller/controller.py +++ b/src/drunc/controller/controller.py @@ -5,6 +5,7 @@ from typing import Callable, List, TypeVar from daqpytools.logging.handlers import LogHandlerConf +from daqpytools.logging.logger import setup_daq_ers_logger from druncschema.authoriser_pb2 import ActionType, SystemType from druncschema.broadcast_pb2 import BroadcastType from druncschema.controller_pb2 import ( @@ -86,7 +87,8 @@ def __init__(self, configuration, name: str, session: str, token: Token): self.broadcast_service = None self.monitoring_metrics = ControllerMonitoringMetrics() self.handlerconf = LogHandlerConf(init_ers=True) - self.log = get_logger(f"controller.core.{name}_ctrl", ers_kafka_handler=False) + self.log = get_logger(f"controller.core.{name}_ctrl") + setup_daq_ers_logger(self.log, session) log_init = get_logger("controller.core.__init__") log_init.info(f"Initialising controller '{name}' with session '{session}'") diff --git a/src/drunc/process_manager/process_manager.py b/src/drunc/process_manager/process_manager.py index f15bd20ab..af5c7d075 100644 --- a/src/drunc/process_manager/process_manager.py +++ b/src/drunc/process_manager/process_manager.py @@ -3,7 +3,8 @@ import threading import time -from daqpytools.logging.handlers import HandlerType, LogHandlerConf +from daqpytools.logging.handlers import LogHandlerConf +from daqpytools.logging.logger import setup_daq_ers_logger from druncschema.authoriser_pb2 import ActionType, SystemType from druncschema.broadcast_pb2 import BroadcastType from druncschema.description_pb2 import CommandDescription, Description @@ -64,8 +65,8 @@ def __init__( self.handlerconf = LogHandlerConf(init_ers=True) self.log = get_logger( f"process_manager.{configuration.get_data_type_name()}_process_manager", - ers_kafka_handler=False, ) + setup_daq_ers_logger(self.log, session) self.log.debug(pid_info_str()) self.log.debug("Initialized ProcessManager") @@ -227,8 +228,6 @@ def find_by_uuid(pi_list, target_uuid: str): continue pi = find_by_uuid(results, diff) err_msg = f"Process {pi.process_description.metadata.name} with UUID {pi.uuid.uuid} has died with a return code {pi.return_code}" - # easiest way to send one to Rich and ERS - self.log.critical(err_msg, extra={"handlers": [HandlerType.Rich]}) self.log.critical(err_msg, extra=self.handlerconf.ERS) time.sleep(interval_s) diff --git a/tests/process_manager/test_process_manager_endpoints.py b/tests/process_manager/test_process_manager_endpoints.py index 92d1e4d08..67585d9ce 100644 --- a/tests/process_manager/test_process_manager_endpoints.py +++ b/tests/process_manager/test_process_manager_endpoints.py @@ -61,18 +61,20 @@ def grpc_servicer(mock_logger, monkeypatch): # Injecting them in the test monkeypatch.setenv( "DUNEDAQ_ERS_ERROR", - "erstrace,throttle,lstdout,protobufstream(monkafka.cern.ch:30092)", - ) - monkeypatch.setenv( - "DUNEDAQ_ERS_FATAL", "erstrace,lstdout,protobufstream(monkafka.cern.ch:30092)" + "rich", ) + monkeypatch.setenv("DUNEDAQ_ERS_FATAL", "rich") monkeypatch.setenv( "DUNEDAQ_ERS_INFO", - "erstrace,throttle,lstdout,protobufstream(monkafka.cern.ch:30092)", + "rich", ) monkeypatch.setenv( "DUNEDAQ_ERS_WARNING", - "erstrace,throttle,lstdout,protobufstream(monkafka.cern.ch:30092)", + "rich", + ) + monkeypatch.setattr( + "drunc.process_manager.process_manager.setup_daq_ers_logger", + lambda *args, **kwargs: None, ) servicer = ConcreteProcessManager(session="mock_session")