detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-21 07:28:41 +01:00
Code Issues Actions Packages Releases Activity

updated logger

Browse Source
This commit is contained in:
mazzol_a
2026-02-20 16:56:33 +01:00
parent f50f600bb8
commit 5d0f7158ae
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -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)

1
slsDetectorServers/matterhonServer/CMakeLists.txt
View File

@@ -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
)

4
slsSupportLib/include/sls/logger.h
View File

@@ -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;
}