Skip to content
Snippets Groups Projects
Commit 8611d845 authored by Maxence Naud's avatar Maxence Naud Committed by Marwa ABDELOUINISSE
Browse files

Merge branch 'FixLog' into 'dev'

Fix log

See merge request eclipse/aidge/aidge_core!326

(cherry picked from commit e068a93f)

9b70101b Fix eclipse/aidge/aidge_core#228



Co-authored-by: default avatarMaxence Naud <maxence.naud@cea.fr>
parent 095c795b
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,8 @@ namespace Aidge { ...@@ -24,6 +24,8 @@ namespace Aidge {
* @brief Initialize console log level from environment. If compile mode is * @brief Initialize console log level from environment. If compile mode is
* DEBUG, then the default level is Log::Level::Debug, else it is * DEBUG, then the default level is Log::Level::Debug, else it is
* Log::Level::Notice. * Log::Level::Notice.
*
* WARNING: Do not use this variable directly, use getConsoleLevel() instead.
*/ */
Log::Level Log::mConsoleLevel = []() { Log::Level Log::mConsoleLevel = []() {
#ifndef NDEBUG #ifndef NDEBUG
...@@ -58,7 +60,7 @@ bool Log::mConsoleColor = []() { ...@@ -58,7 +60,7 @@ bool Log::mConsoleColor = []() {
*/ */
Log::Level Log::mFileLevel = []() { Log::Level Log::mFileLevel = []() {
#ifndef NDEBUG #ifndef NDEBUG
constexpr Level defaultLevel = Level::Debug; constexpr Log::Level defaultLevel = Level::Debug;
#else #else
constexpr Log::Level defaultLevel = Level::Notice; constexpr Log::Level defaultLevel = Level::Notice;
#endif #endif
...@@ -164,7 +166,7 @@ void Log::log(Level level, const std::string& msg) { ...@@ -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 levelIndentSizes[6] = {10, 9, 11, 12, 10, 10};
const std::size_t width = 80 - levelIndentSizes[static_cast<std::size_t>(level)]; const std::size_t width = 80 - levelIndentSizes[static_cast<std::size_t>(level)];
if (level >= mConsoleLevel) { if (level >= getConsoleLevel()) {
for (const auto& context : mContext) { for (const auto& context : mContext) {
fmt::println("Context: {}", context); fmt::println("Context: {}", context);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment