From a783cd8f40594b686bc40d52a2af95bedba7a8d5 Mon Sep 17 00:00:00 2001 From: thejch <66577496+thejch@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:07:35 -0700 Subject: [PATCH] =?UTF-8?q?log:=20Add=20some=20colors=20to=20stdout=20log?= =?UTF-8?q?=20=F0=9F=94=B4=F0=9F=9F=A1=F0=9F=9F=A2=F0=9F=94=B5=F0=9F=9F=A3?= =?UTF-8?q?=20(#5778)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add colored log * add config option * make it dynamic --- src/config/ConfigManager.cpp | 5 ++++- src/debug/Log.cpp | 35 +++++++++++++++++++++++++++-------- src/debug/Log.hpp | 1 + 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 3c1bc80d..4a03b180 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -377,6 +377,7 @@ CConfigManager::CConfigManager() { m_pConfig->addConfigValue("debug:error_limit", Hyprlang::INT{5}); m_pConfig->addConfigValue("debug:watchdog_timeout", Hyprlang::INT{5}); m_pConfig->addConfigValue("debug:disable_scale_checks", Hyprlang::INT{0}); + m_pConfig->addConfigValue("debug:colored_stdout_logs", Hyprlang::INT{1}); m_pConfig->addConfigValue("decoration:rounding", Hyprlang::INT{0}); m_pConfig->addConfigValue("decoration:blur:enabled", Hyprlang::INT{1}); @@ -592,7 +593,7 @@ CConfigManager::CConfigManager() { setDefaultAnimationVars(); resetHLConfig(); - Debug::log(LOG, + Debug::log(INFO, "!!!!HEY YOU, YES YOU!!!!: further logs to stdout / logfile are disabled by default. BEFORE SENDING THIS LOG, ENABLE THEM. Use debug:disable_logs = false to do so: " "https://wiki.hyprland.org/Configuring/Variables/#debug"); @@ -818,6 +819,8 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) { if (Debug::disableStdout && isFirstLaunch) Debug::log(LOG, "Disabling stdout logs! Check the log for further logs."); + Debug::coloredLogs = reinterpret_cast(m_pConfig->getConfigValuePtr("debug:colored_stdout_logs")->getDataStaticPtr()); + for (auto& m : g_pCompositor->m_vMonitors) { // mark blur dirty g_pHyprOpenGL->markBlurDirtyForMonitor(m.get()); diff --git a/src/debug/Log.cpp b/src/debug/Log.cpp index 9fdf47f8..8b82c852 100644 --- a/src/debug/Log.cpp +++ b/src/debug/Log.cpp @@ -40,13 +40,32 @@ void Debug::log(LogLevel level, std::string str) { if (shuttingDown) return; + std::string coloredStr = str; switch (level) { - case LOG: str = "[LOG] " + str; break; - case WARN: str = "[WARN] " + str; break; - case ERR: str = "[ERR] " + str; break; - case CRIT: str = "[CRITICAL] " + str; break; - case INFO: str = "[INFO] " + str; break; - case TRACE: str = "[TRACE] " + str; break; + case LOG: + str = "[LOG] " + str; + coloredStr = str; + break; + case WARN: + str = "[WARN] " + str; + coloredStr = "\033[1;33m" + str + "\033[0m"; // yellow + break; + case ERR: + str = "[ERR] " + str; + coloredStr = "\033[1;31m" + str + "\033[0m"; // red + break; + case CRIT: + str = "[CRITICAL] " + str; + coloredStr = "\033[1;35m" + str + "\033[0m"; // magenta + break; + case INFO: + str = "[INFO] " + str; + coloredStr = "\033[1;32m" + str + "\033[0m"; // green + break; + case TRACE: + str = "[TRACE] " + str; + coloredStr = "\033[1;34m" + str + "\033[0m"; // blue + break; default: break; } @@ -65,5 +84,5 @@ void Debug::log(LogLevel level, std::string str) { // log it to the stdout too. if (!disableStdout) - std::cout << str << "\n"; -} \ No newline at end of file + std::cout << ((coloredLogs && !**coloredLogs) ? str : coloredStr) << "\n"; +} diff --git a/src/debug/Log.hpp b/src/debug/Log.hpp index f1dd3eab..abf74065 100644 --- a/src/debug/Log.hpp +++ b/src/debug/Log.hpp @@ -27,6 +27,7 @@ namespace Debug { inline bool disableStdout = false; inline bool trace = false; inline bool shuttingDown = false; + inline int64_t* const* coloredLogs = nullptr; inline std::string rollingLog = ""; // rolling log contains the ROLLING_LOG_SIZE tail of the log