kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

Improve a parameter name for fs_cli

Browse Source 
What we momentarily called log-uuid-chars is now better called
log-uuid-length.  Setting log-uuid-length will specify a truncation
length for UUIDs displayed by setting log-uuid.
This commit is contained in:
Travis Cross 2014-06-04 16:04:20 +00:00
parent 3549488e8e
commit 31186d815b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/esl/fs_cli.c
View File

@ -59,7 +59,7 @@ typedef struct {
const char *console_fnkeys[12]; const char *console_fnkeys[12];
char loglevel[128]; char loglevel[128];
int log_uuid; int log_uuid;
int log_uuid_chars; int log_uuid_length;
int quiet; int quiet;
int batch_mode; int batch_mode;
char prompt_color[12]; char prompt_color[12];
@ -67,7 +67,7 @@ typedef struct {
char output_text_color[12]; char output_text_color[12];
} cli_profile_t; } cli_profile_t;
static const int log_uuid_short_chars = 8; static const int log_uuid_short_length = 8;
static int is_color = 1; static int is_color = 1;
static int warn_stop = 0; static int warn_stop = 0;
static int connected = 0; static int connected = 0;
@ -745,9 +745,9 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
printf("%s", colors[level]); printf("%s", colors[level]);
} }
if (global_profile->log_uuid && !esl_strlen_zero(userdata)) { if (global_profile->log_uuid && !esl_strlen_zero(userdata)) {
if (global_profile->log_uuid_chars) { if (global_profile->log_uuid_length) {
int len = strlen(userdata); int len = strlen(userdata);
int i = (global_profile->log_uuid_chars < len) ? global_profile->log_uuid_chars : len; int i = (global_profile->log_uuid_length < len) ? global_profile->log_uuid_length : len;
fwrite(userdata, sizeof(char), i, stdout); fwrite(userdata, sizeof(char), i, stdout);
printf(" "); printf(" ");
} else { } else {
@ -1247,11 +1247,11 @@ static void read_config(const char *dft_cfile, const char *cfile) {
profiles[pcount-1].log_uuid = esl_true(val); profiles[pcount-1].log_uuid = esl_true(val);
} else if(!strcasecmp(var, "log-uuid-short")) { } else if(!strcasecmp(var, "log-uuid-short")) {
profiles[pcount-1].log_uuid = esl_true(val); profiles[pcount-1].log_uuid = esl_true(val);
profiles[pcount-1].log_uuid_chars = (esl_true(val) ? log_uuid_short_chars : 0); profiles[pcount-1].log_uuid_length = (esl_true(val) ? log_uuid_short_length : 0);
} else if(!strcasecmp(var, "log-uuid-chars")) { } else if(!strcasecmp(var, "log-uuid-length")) {
int i; int i;
if ((i = atoi(val)) > -1) { if ((i = atoi(val)) > -1) {
profiles[pcount-1].log_uuid_chars = i; profiles[pcount-1].log_uuid_length = i;
} }
} else if(!strcasecmp(var, "quiet")) { } else if(!strcasecmp(var, "quiet")) {
profiles[pcount-1].quiet = esl_true(val); profiles[pcount-1].quiet = esl_true(val);
@ -1512,7 +1512,7 @@ int main(int argc, char *argv[])
} }
if (argv_log_uuid_short) { if (argv_log_uuid_short) {
profile->log_uuid = 1; profile->log_uuid = 1;
profile->log_uuid_chars = log_uuid_short_chars; profile->log_uuid_length = log_uuid_short_length;
} }
esl_log(ESL_LOG_DEBUG, "Using profile %s [%s]\n", profile->name, profile->host); 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(prompt_color, profile->prompt_color);