aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/common/logging
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2014-11-04 01:42:34 -0200
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2014-12-13 01:59:52 -0200
commit6b0fb62c47875bf19edcb8e964d7595662caf5b3 (patch)
tree7c6727de7e673e347938f4b7bcbd51dc6b784aa9 /src/common/logging
parent616d87444313db865c60fbeee36ebe5250ef301e (diff)
Re-add coloring to the console logging output.
Diffstat (limited to 'src/common/logging')
-rw-r--r--src/common/logging/text_formatter.cpp50
1 files changed, 50 insertions, 0 deletions
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index 01c355bb..b603ead1 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -5,6 +5,11 @@
#include <array>
#include <cstdio>
+#ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <Windows.h>
+#endif
+
#include "common/logging/backend.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"
@@ -23,7 +28,52 @@ void FormatLogMessage(const Entry& entry, char* out_text, size_t text_len) {
entry.location.c_str(), entry.message.c_str());
}
+static void ChangeConsoleColor(Level level) {
+#ifdef _WIN32
+ static HANDLE console_handle = GetStdHandle(STD_ERROR_HANDLE);
+
+ WORD color = 0;
+ switch (level) {
+ case Level::Trace: // Grey
+ color = FOREGROUND_INTENSITY; break;
+ case Level::Debug: // Cyan
+ color = FOREGROUND_GREEN | FOREGROUND_BLUE; break;
+ case Level::Info: // Bright gray
+ color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; break;
+ case Level::Warning: // Bright yellow
+ color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY; break;
+ case Level::Error: // Bright red
+ color = FOREGROUND_RED | FOREGROUND_INTENSITY; break;
+ case Level::Critical: // Bright magenta
+ color = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY; break;
+ }
+
+ SetConsoleTextAttribute(console_handle, color);
+#else
+#define ESC "\x1b"
+ const char* color = "";
+ switch (level) {
+ case Level::Trace: // Grey
+ color = ESC "[1;30m"; break;
+ case Level::Debug: // Cyan
+ color = ESC "[0;36m"; break;
+ case Level::Info: // Bright gray
+ color = ESC "[0;37m"; break;
+ case Level::Warning: // Bright yellow
+ color = ESC "[1;33m"; break;
+ case Level::Error: // Bright red
+ color = ESC "[1;31m"; break;
+ case Level::Critical: // Bright magenta
+ color = ESC "[1;35m"; break;
+ }
+#undef ESC
+
+ fputs(color, stderr);
+#endif
+}
+
void PrintMessage(const Entry& entry) {
+ ChangeConsoleColor(entry.log_level);
std::array<char, 4 * 1024> format_buffer;
FormatLogMessage(entry, format_buffer.data(), format_buffer.size());
fputs(format_buffer.data(), stderr);