From ee793168bcb88606c334fd6022c3926a1c963d1d Mon Sep 17 00:00:00 2001
From: Lukas Nellen <lukas@nucleares.unam.mx>
Date: Mon, 1 Mar 2021 15:21:33 -0600
Subject: [PATCH] Logger default patterns
- names for all patterns
- define only once
---
corsika/detail/framework/core/Logging.inl | 8 +++-----
corsika/framework/core/Logging.hpp | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/corsika/detail/framework/core/Logging.inl b/corsika/detail/framework/core/Logging.inl
index 9abaa1636..ca6776fc7 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 29ef3e13c..2daea27c5 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.
--
GitLab