From c5a91f3b427055feef8718ac766a7bb2add1c5cf Mon Sep 17 00:00:00 2001
From: Maxence Naud <maxence.naud@cea.fr>
Date: Tue, 11 Feb 2025 10:00:31 +0000
Subject: [PATCH] Merge branch 'FixLog' into 'dev'
Fix log
See merge request eclipse/aidge/aidge_core!326
(cherry picked from commit e068a93fdc9828fc88de513350a4609d78b69f0e)
9b70101b Fix https://gitlab.eclipse.org/eclipse/aidge/aidge_core/-/issues/228
Co-authored-by: Maxence Naud <maxence.naud@cea.fr>
---
src/utils/Log.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/utils/Log.cpp b/src/utils/Log.cpp
index b4c64d527..9755aa61d 100644
--- a/src/utils/Log.cpp
+++ b/src/utils/Log.cpp
@@ -24,6 +24,8 @@ namespace Aidge {
* @brief Initialize console log level from environment. If compile mode is
* DEBUG, then the default level is Log::Level::Debug, else it is
* Log::Level::Notice.
+ *
+ * WARNING: Do not use this variable directly, use getConsoleLevel() instead.
*/
Log::Level Log::mConsoleLevel = []() {
#ifndef NDEBUG
@@ -58,7 +60,7 @@ bool Log::mConsoleColor = []() {
*/
Log::Level Log::mFileLevel = []() {
#ifndef NDEBUG
- constexpr Level defaultLevel = Level::Debug;
+ constexpr Log::Level defaultLevel = Level::Debug;
#else
constexpr Log::Level defaultLevel = Level::Notice;
#endif
@@ -164,7 +166,7 @@ void Log::log(Level level, const std::string& msg) {
const std::size_t levelIndentSizes[6] = {10, 9, 11, 12, 10, 10};
const std::size_t width = 80 - levelIndentSizes[static_cast<std::size_t>(level)];
- if (level >= mConsoleLevel) {
+ if (level >= getConsoleLevel()) {
for (const auto& context : mContext) {
fmt::println("Context: {}", context);
}
--
GitLab