Changeset 2159 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.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/pjsip-apps/src/pjsua/pjsua_app.c (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -159 +159 @@
     puts  ("  --log-level=N       Set log max level to N (0(none) to 6(trace)) (default=5)");
     puts  ("  --app-log-level=N   Set log max level for stdout display (default=4)");
+    puts  ("  --color             Use colorful logging (default yes on Win32)");
+    puts  ("  --no-color          Disable colorful logging");
+
     puts  ("");
     puts  ("SIP Account options:");
@@ -443 +446 @@
     int option_index;
     enum { OPT_CONFIG_FILE=127, OPT_LOG_FILE, OPT_LOG_LEVEL, OPT_APP_LOG_LEVEL, 
+           OPT_COLOR, OPT_NO_COLOR,
            OPT_HELP, OPT_VERSION, OPT_NULL_AUDIO, OPT_SND_AUTO_CLOSE,
            OPT_LOCAL_PORT, OPT_IP_ADDR, OPT_PROXY, OPT_OUTBOUND_PROXY, 
@@ -477 +481 @@
         { "log-level",  1, 0, OPT_LOG_LEVEL},
         { "app-log-level",1,0,OPT_APP_LOG_LEVEL},
+        { "color",      0, 0, OPT_COLOR},
+        { "no-color",   0, 0, OPT_NO_COLOR},
         { "help",       0, 0, OPT_HELP},
         { "version",    0, 0, OPT_VERSION},
@@ -638 +644 @@
             break;
 
+        case OPT_COLOR:
+            cfg->log_cfg.decor |= PJ_LOG_HAS_COLOR;
+            break;
+
+        case OPT_NO_COLOR:
+            cfg->log_cfg.decor &= ~PJ_LOG_HAS_COLOR;
+            break;
+
         case OPT_HELP:
             usage();
@@ -3757 +3771 @@
                 len = write_settings(&app_config, settings, sizeof(settings));
                 if (len < 1)
-                    PJ_LOG(3,(THIS_FILE, "Error: not enough buffer"));
+                    PJ_LOG(1,(THIS_FILE, "Error: not enough buffer"));
                 else
                     PJ_LOG(3,(THIS_FILE, 
@@ -3784 +3798 @@
                 len = write_settings(&app_config, settings, sizeof(settings));
                 if (len < 1)
-                    PJ_LOG(3,(THIS_FILE, "Error: not enough buffer"));
+                    PJ_LOG(1,(THIS_FILE, "Error: not enough buffer"));
                 else {
                     pj_oshandle_t fd;
@@ -4082 +4096 @@
 
     if (transport_id == -1) {
-        PJ_LOG(3,(THIS_FILE, "Error: no transport is configured"));
+        PJ_LOG(1,(THIS_FILE, "Error: no transport is configured"));
         status = -1;
         goto on_error;