From 5d0f7158ae7aca2546fcf844f50bd2fa9bc87221 Mon Sep 17 00:00:00 2001 From: Alice Date: Fri, 20 Feb 2026 16:56:33 +0100 Subject: [PATCH] updated logger --- CMakeLists.txt | 9 ++++----- slsDetectorServers/matterhonServer/CMakeLists.txt | 1 + slsSupportLib/include/sls/logger.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aea81594f..7315438cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,8 @@ if(NOT CMAKE_USE_PTHREADS_INIT) message(FATAL_ERROR "A POSIX threads (pthread) implementation is required, but was not found.") endif() -set(SLS_LOG_MAX_REPORTING_LEVEL sls::logINFO CACHE STRING "set logging level") +set(SLS_LOG_MAX_REPORTING_LEVEL sls::TLogLevel::logINFO CACHE STRING "set logging level") +#set(LOG_MAX_REPORTING_LEVEL "${SLS_LOG_MAX_REPORTING_LEVEL}" CACHE STRING "set logging level" FORCE) option(SLS_USE_SYSTEM_ZMQ "Use system installed libzmq" OFF) @@ -309,17 +310,15 @@ if(SLS_EXT_BUILD) endif() - # slsProjectOptions and slsProjectWarnings are used # to control options for the libraries if(NOT TARGET slsProjectOptions) add_library(slsProjectOptions INTERFACE) target_compile_features(slsProjectOptions INTERFACE cxx_std_17) + target_compile_definitions(slsProjectOptions + INTERFACE LOG_MAX_REPORTING_LEVEL=${SLS_LOG_MAX_REPORTING_LEVEL}) endif() -target_compile_definitions(slsProjectOptions - INTERFACE LOG_MAX_REPORTING_LEVEL=${SLS_LOG_MAX_REPORTING_LEVEL} -) if (NOT TARGET slsProjectWarnings) add_library(slsProjectWarnings INTERFACE) diff --git a/slsDetectorServers/matterhonServer/CMakeLists.txt b/slsDetectorServers/matterhonServer/CMakeLists.txt index 93f017fed..8dbca46fb 100644 --- a/slsDetectorServers/matterhonServer/CMakeLists.txt +++ b/slsDetectorServers/matterhonServer/CMakeLists.txt @@ -3,6 +3,7 @@ add_executable(matterhornDetectorServer_virtual ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornApp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornServer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/MatterhornClientInterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/StopServer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/CommandLineOptions.cpp ) diff --git a/slsSupportLib/include/sls/logger.h b/slsSupportLib/include/sls/logger.h index 276789635..5754286e7 100644 --- a/slsSupportLib/include/sls/logger.h +++ b/slsSupportLib/include/sls/logger.h @@ -38,7 +38,7 @@ enum TLogLevel { class Logger { std::ostringstream os; - TLogLevel level = LOG_MAX_REPORTING_LEVEL; + TLogLevel level = ReportingLevel(); public: Logger() = default; @@ -50,7 +50,7 @@ class Logger { } static TLogLevel &ReportingLevel() { // singelton eeh - static TLogLevel reportingLevel = logINFO; + static TLogLevel reportingLevel = LOG_MAX_REPORTING_LEVEL; return reportingLevel; }