FS-2816 --resolve

diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c
index 0e6521908c1e54b14e8159b6b7628dec50b608e8..393fcf80d3a828f38e4ae21f9b0b86b6705cf4df 100644 (file)
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@ -57,6 +57,7 @@ typedef struct {
        int debug;
        const char *console_fnkeys[12];
        char loglevel[128];
+       int log_uuid;
        int quiet;
        int batch_mode;
        char prompt_color[12];
@@ -595,6 +596,7 @@ static const char *usage_str =
        "  -i, --interrupt                 Allow Control-c to interrupt\n"
        "  -x, --execute=command           Execute Command and Exit\n"
        "  -l, --loglevel=command          Log Level\n"
+       "  -U, --log-uuid                  Include UUID in log output\n"
        "  -q, --quiet                     Disable logging\n"
        "  -r, --retry                     Retry connection on failure\n"
        "  -R, --reconnect                 Reconnect if disconnected\n"
@@ -745,10 +747,14 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
                                                        if (aok) {
                                                                if (feature_level) clear_line();
                                                                if(!(global_profile->batch_mode)) {
-                                                                       printf("%s%s", colors[level], handle->last_event->body);
+                                                                       printf("%s", colors[level]);
+                                                               }
+                                                               if (global_profile->log_uuid && !esl_strlen_zero(userdata)) {
+                                                                       printf("%s ", userdata);
+                                                               }
+                                                               printf("%s", handle->last_event->body);
+                                                               if(!(global_profile->batch_mode)) {
                                                                        if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR);
-                                                               } else {
-                                                                       printf("%s", handle->last_event->body);
                                                                }
                                                                if (feature_level) redisplay();
                                                        }
@@ -757,6 +763,10 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
                                                                if(!(global_profile->batch_mode)) {
                                                                        SetConsoleTextAttribute(hStdout, colors[level]);
                                                                }
+                                                               if (global_profile->log_uuid && !esl_strlen_zero(userdata)) {
+                                                                       WriteFile(hStdout, userdata, strlen(userdata), &outbytes, NULL);
+                                                                       WriteFile(hStdout, " ", strlen(" "), &outbytes, NULL);
+                                                               }
                                                                WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL);
                                                                if(!(global_profile->batch_mode)) {
                                                                        SetConsoleTextAttribute(hStdout, wOldColorAttrs);
@@ -1221,6 +1231,8 @@ static void read_config(const char *dft_cfile, const char *cfile) {
                                }
                        } else if(!strcasecmp(var, "loglevel")) {
                                esl_set_string(profiles[pcount-1].loglevel, val);
+                       } else if(!strcasecmp(var, "log-uuid")) {
+                               profiles[pcount-1].log_uuid = esl_true(val);
                        } else if(!strcasecmp(var, "quiet")) {
                                profiles[pcount-1].quiet = esl_true(val);
                        } else if(!strcasecmp(var, "prompt-color")) {
@@ -1282,6 +1294,7 @@ int main(int argc, char *argv[])
                {"debug", 1, 0, 'd'},
                {"execute", 1, 0, 'x'},
                {"loglevel", 1, 0, 'l'},
+               {"log-uuid", 0, 0, 'U'},
                {"quiet", 0, 0, 'q'},
                {"batchmode", 0, 0, 'b'},
                {"retry", 0, 0, 'r'},
@@ -1303,6 +1316,7 @@ int main(int argc, char *argv[])
        int argv_exec = 0;
        char argv_command[1024] = "";
        char argv_loglevel[128] = "";
+       int argv_log_uuid = 0;
        int argv_quiet = 0;
        int argv_batch = 0;
        int loops = 2, reconnect = 0, timeout = 0;
@@ -1340,7 +1354,7 @@ int main(int argc, char *argv[])
        esl_global_set_default_logger(6); /* default debug level to 6 (info) */
        for(;;) {
                int option_index = 0;
-               opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhib?n", options, &option_index);
+               opt = getopt_long(argc, argv, "H:P:S:u:p:d:x:l:Ut:qrRhib?n", options, &option_index);
                if (opt == -1) break;
                switch (opt) {
                        case 'H':
@@ -1383,6 +1397,9 @@ int main(int argc, char *argv[])
                        case 'l':
                                esl_set_string(argv_loglevel, optarg);
                                break;
+                       case 'U':
+                               argv_log_uuid = 1;
+                               break;
                        case 'q':
                                argv_quiet = 1;
                                break;
@@ -1445,6 +1462,9 @@ int main(int argc, char *argv[])
                esl_set_string(profile->loglevel, argv_loglevel);
                profile->quiet = 0;
        }
+       if (argv_log_uuid) {
+               profile->log_uuid = 1;
+       }
        esl_log(ESL_LOG_DEBUG, "Using profile %s [%s]\n", profile->name, profile->host);
        esl_set_string(prompt_color, profile->prompt_color);
        esl_set_string(input_text_color, profile->input_text_color);

diff --git a/src/mod/loggers/mod_console/mod_console.c b/src/mod/loggers/mod_console/mod_console.c
index 905029b92b31e556853979b218210ae43c5fbc19..4b80add5e4ae825ad788a023a8b28b63628d45dd 100644 (file)
--- a/src/mod/loggers/mod_console/mod_console.c
+++ b/src/mod/loggers/mod_console/mod_console.c
@@ -60,6 +60,7 @@ static switch_memory_pool_t *module_pool = NULL;
 static switch_hash_t *log_hash = NULL;
 static uint32_t all_level = 0;
 static int32_t hard_log_level = SWITCH_LOG_DEBUG;
+static switch_bool_t log_uuid = SWITCH_FALSE;
 //static int32_t failed_write = 0;
 static void del_mapping(char *var)
 {
@@ -138,6 +139,8 @@ static switch_status_t config_logger(void)
 #endif
                        } else if (!strcasecmp(var, "loglevel") && !zstr(val)) {
                                hard_log_level = switch_log_str2level(val);
+                       } else if (!strcasecmp(var, "uuid") && switch_true(val)) {
+                               log_uuid = SWITCH_TRUE;
                        }
                }
        }
@@ -244,11 +247,21 @@ static switch_status_t switch_console_logger(const switch_log_node_t *node, swit
                                DWORD len = (DWORD) strlen(node->data);
                                DWORD outbytes = 0;
                                SetConsoleTextAttribute(hStdout, COLORS[node->level]);
+                               if (log_uuid && !zstr(node->userdata)) {
+                                       WriteFile(hStdout, node->userdata, strlen(node->userdata), &outbytes, NULL);
+                                       WriteFile(hStdout, " ", strlen(" "), &outbytes, NULL);
+                               }
                                WriteFile(hStdout, node->data, len, &outbytes, NULL);
                                SetConsoleTextAttribute(hStdout, wOldColorAttrs);
 #else
-                               fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR);
+                               if (log_uuid && !zstr(node->userdata)) {
+                                       fprintf(handle, "%s%s %s%s", COLORS[node->level], node->userdata, node->data, SWITCH_SEQ_DEFAULT_COLOR);
+                               } else {
+                                       fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR);
+                               }
 #endif
+                       } else if (log_uuid && !zstr(node->userdata)) {
+                               fprintf(handle, "%s %s", node->userdata, node->data);
                        } else {
                                fprintf(handle, "%s", node->data);
                        }