Changeset 2159 for pjproject/trunk/pjlib/src/pj/log_writer_stdout.c

Timestamp:

Jul 19, 2008 5:53:47 PM (16 years ago)

Author:

bennylp

Message:

Ticket #571: Coloring for logs in Linux/UNIX, two more spaces in logs and runtime log colors configuration (thanks Ondrej.Sterbak)

File:

• pjproject/trunk/pjlib/src/pj/log_writer_stdout.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/log_writer_stdout.c

@@ -21 +21 @@
 #include <pj/compat/stdfileio.h>
 
-#define CLR_FATAL    (PJ_TERM_COLOR_BRIGHT | PJ_TERM_COLOR_R)
-#define CLR_WARNING  (PJ_TERM_COLOR_BRIGHT | PJ_TERM_COLOR_R | PJ_TERM_COLOR_G)
-#define CLR_INFO     (PJ_TERM_COLOR_BRIGHT | PJ_TERM_COLOR_R | PJ_TERM_COLOR_G | \
-                      PJ_TERM_COLOR_B)
-#define CLR_DEFAULT  (PJ_TERM_COLOR_R | PJ_TERM_COLOR_G | PJ_TERM_COLOR_B)
 
 static void term_set_color(int level)
 {
 #if defined(PJ_TERM_HAS_COLOR) && PJ_TERM_HAS_COLOR != 0
-    unsigned attr = 0;
-    switch (level) {
-    case 0:
-    case 1: attr = CLR_FATAL; 
-        break;
-    case 2: attr = CLR_WARNING; 
-        break;
-    case 3: attr = CLR_INFO; 
-        break;
-    default:
-        attr = CLR_DEFAULT;
-        break;
-    }
-
-    pj_term_set_color(attr);
+    pj_term_set_color(pj_log_get_color(level));
 #endif
 }
@@ -51 +32 @@
 {
 #if defined(PJ_TERM_HAS_COLOR) && PJ_TERM_HAS_COLOR != 0
-    pj_term_set_color(CLR_DEFAULT);
+    /* Set terminal to its default color */
+    pj_term_set_color(pj_log_get_color(77));
 #endif
 }
@@ -62 +44 @@
 
     /* Copy to terminal/file. */
-    term_set_color(level);
-    printf("%s", buffer);
-    term_restore_color();
+    if (pj_log_get_decor() & PJ_LOG_HAS_COLOR) {
+        term_set_color(level);
+        printf("%s", buffer);
+        term_restore_color();
+    } else {
+        printf("%s", buffer);
+    }
 }