Skip to content
Snippets Groups Projects
Commit 53e848ad authored by Maxence Naud's avatar Maxence Naud
Browse files

Merge branch 'cherry-pick-e068a93f' into 'patch_v0-5-1'

Merge branch 'FixLog' into 'dev'

See merge request !327
parents 3ce55d06 c5a91f3b
No related branches found
No related tags found
2 merge requests!327Merge branch 'FixLog' into 'dev',!325[Upd] Patch v0.5.1
Pipeline #65070 passed
...@@ -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