diff --git a/corsika/detail/framework/core/Logging.inl b/corsika/detail/framework/core/Logging.inl index 9abaa163683b4b1a70ce6a22d3cb3070e67d7516..ca6776fc788ce8ca57a5bfe409d7fa83eb618823 100644 --- a/corsika/detail/framework/core/Logging.inl +++ b/corsika/detail/framework/core/Logging.inl @@ -1,4 +1,4 @@ -/* +/* -*-c++-*- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu * * This software is distributed under the terms of the GNU General Public @@ -21,15 +21,13 @@ namespace corsika { /* * The default pattern for CORSIKA8 loggers. */ - std::string const default_pattern{"[%n:%^%-8l%$] %v"}; - inline auto set_default_level(level::level_enum const minlevel) -> void { spdlog::set_level(minlevel); } template <typename TLogger> inline auto add_source_info(TLogger& logger) -> void { - logger->set_pattern("[%n:%^%-8l%$(%s:%!:%#)] %v"); + logger->set_pattern(source_pattern); } template <typename TLogger> @@ -48,7 +46,7 @@ namespace corsika { // set the default C8 format #if (!defined(_GLIBCXX_USE_CXX11_ABI) || _GLIBCXX_USE_CXX11_ABI == 1) - logger->set_pattern(logging::default_pattern); + logger->set_pattern(default_pattern); #else // special case: gcc from the software collections devtoolset std::string dp(default_pattern); diff --git a/corsika/framework/core/Logging.hpp b/corsika/framework/core/Logging.hpp index 29ef3e13c55470f95d933f4bcb6e998cdef68fef..2daea27c596be86c039f31f7a0b608e28d47ff4e 100644 --- a/corsika/framework/core/Logging.hpp +++ b/corsika/framework/core/Logging.hpp @@ -50,6 +50,7 @@ namespace corsika { * The default pattern for CORSIKA8 loggers. */ const std::string default_pattern{"[%n:%^%-8l%$] %v"}; + const std::string source_pattern{"[%n:%^%-8l%$(%s:%!:%#)] %v"}; /** * Create a new C8-style logger.