Changeset 397

Timestamp:

06/23/15 00:53:10 (9 years ago)

Author:

Maciej Komosinski

Message:

Colors in console (stdout)

Location:

cpp/common/loggers

Files:

• loggertostdout.cpp (modified) (3 diffs)
• loggertostdout.h (modified) (1 diff)

cpp/common/loggers/loggertostdout.cpp

@@ -4 +4 @@
 
 #include "loggertostdout.h"
+#include <common/console.h>
 #ifdef SHP
 #include <FBaseSys.h> //AppLog
@@ -9 +10 @@
 #include <stdio.h>
 #endif
+
+static const char* default_log_level_ansicolor[] =
+  { "[\033[2mDEBUG\033[0m] \033[2m", "", "[\033[33mWARN\033[0m] \033[1m", "[\033[1;31mERROR\033[0m] \033[1m", "[\033[1;31mCRITICAL\033[0m] \033[1m" };
+
+const char** LoggerToStdout::default_log_level[] =
+ { LOG_LEVEL, default_log_level_ansicolor };
+
+const char* LoggerToStdout::default_log_format[]= //note trailing %s (so it's easy to append "\n" later)
+ { LOG_FORMAT "%s", "%s%s.%s: %s\033[0m%s" };
+
+LoggerToStdout::LoggerToStdout(int opts, VirtFILE *_file)
+        :LoggerBase(opts), file(_file)
+{
+log_format=default_log_format[console_color_mode];
+log_level=default_log_level[console_color_mode];
+}
 
 void LoggerToStdout::handle(const char *obj, const char *method, int level, const char *msg)
@@ -19 +36 @@
                 file->printf(LOG_FORMAT "\n", LOG_LEVEL[level + 1], obj, method, msg);
         else
-                printf(LOG_FORMAT "\n", LOG_LEVEL[level + 1], obj, method, msg);
+                printf(log_format, log_level[level + 1], obj, method, msg, "\n");
 #endif
 }

cpp/common/loggers/loggertostdout.h

@@ -13 +13 @@
         VirtFILE *file;
 public:
-        LoggerToStdout(int opts = 0, VirtFILE *_file = NULL) :LoggerBase(opts), file(_file) {}
+        LoggerToStdout(int opts = 0, VirtFILE *_file = NULL);
         void handle(const char *obj, const char *method, int level, const char *msg);
+
+        static const char* default_log_format[];
+        static const char** default_log_level[];
+        const char** log_level;
+        const char* log_format;
 };