kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 08:29:45 +00:00
Code Issues Projects Releases Wiki Activity

fs_cli: add batch mode

Browse Source 
Signed-off-by: Travis Cross <tc@traviscross.com>
This commit is contained in:
Mitch Capper 2012-04-08 16:54:40 +00:00 committed by Travis Cross
parent 92e89cb453
commit 6f87ac55d6
1 changed files with 73 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
libs/esl/fs_cli.c
View File

@ -57,6 +57,7 @@ typedef struct {
const char *console_fnkeys[12]; const char *console_fnkeys[12];
char loglevel[128]; char loglevel[128];
int quiet; int quiet;
int batch_mode;
char prompt_color[12]; char prompt_color[12];
char input_text_color[12]; char input_text_color[12];
char output_text_color[12]; char output_text_color[12];
@ -108,6 +109,7 @@ static void sleep_s(int secs) { _sleep_ns(secs, 0); }
static int process_command(esl_handle_t *handle, const char *cmd); static int process_command(esl_handle_t *handle, const char *cmd);
static void clear_cli(void) { static void clear_cli(void) {
if (global_profile->batch_mode) return;
putchar('\r'); putchar('\r');
printf("\033[%dC", bare_prompt_str_len); printf("\033[%dC", bare_prompt_str_len);
printf("\033[K"); printf("\033[K");
@ -401,7 +403,9 @@ static BOOL console_readConsole(HANDLE conIn, char *buf, int len, int *pRed, int
{ {
DWORD recordIndex, bufferIndex, toRead, red; DWORD recordIndex, bufferIndex, toRead, red;
PINPUT_RECORD pInput; PINPUT_RECORD pInput;
GetNumberOfConsoleInputEvents(conIn, &toRead); if (GetNumberOfConsoleInputEvents(conIn, &toRead) == 0) {
return(FALSE);
}
if (len < (int)toRead) { if (len < (int)toRead) {
toRead = len; toRead = len;
} }
@ -548,6 +552,7 @@ static const char *usage_str =
" -r, --retry Retry connection on failure\n" " -r, --retry Retry connection on failure\n"
" -R, --reconnect Reconnect if disconnected\n" " -R, --reconnect Reconnect if disconnected\n"
" -d, --debug=level Debug Level (0 - 7)\n" " -d, --debug=level Debug Level (0 - 7)\n"
" -b, --batchmode Batch mode\n"
" -t, --timeout Timeout for API commands (in miliseconds)\n\n"; " -t, --timeout Timeout for API commands (in miliseconds)\n\n";
static int usage(char *name){ static int usage(char *name){
@ -597,6 +602,7 @@ static int write_char(int c) {
#ifdef WIN32 #ifdef WIN32
static void clear_line(void) static void clear_line(void)
{ {
if (global_profile->batch_mode) return;
putchar('\r'); putchar('\r');
printf("\033[K"); printf("\033[K");
fflush(stdout); fflush(stdout);
@ -605,6 +611,7 @@ static void clear_line(void)
#else #else
static void clear_line(void) static void clear_line(void)
{ {
if (global_profile->batch_mode) return;
if (!(write_char('\r'))) goto done; if (!(write_char('\r'))) goto done;
if (!(write_str("\033[K"))) goto done; if (!(write_str("\033[K"))) goto done;
done: done:
@ -617,6 +624,7 @@ static void redisplay(void)
#ifndef WIN32 #ifndef WIN32
const LineInfo *lf = el_line(el); const LineInfo *lf = el_line(el);
const char *c = lf->buffer; const char *c = lf->buffer;
if (global_profile->batch_mode) return;
if (!(write_str(prompt_str))) goto done; if (!(write_str(prompt_str))) goto done;
while (c < lf->lastchar && *c) { while (c < lf->lastchar && *c) {
if (!(write_char(*c))) goto done; if (!(write_char(*c))) goto done;
@ -642,7 +650,9 @@ static int output_printf(const char *fmt, ...)
int r; int r;
va_start(ap, fmt); va_start(ap, fmt);
#ifndef WIN32 #ifndef WIN32
printf("%s", output_text_color); if (!(global_profile->batch_mode)) {
printf("%s", output_text_color);
}
#endif #endif
r = vprintf(fmt, ap); r = vprintf(fmt, ap);
va_end(ap); va_end(ap);
@ -680,15 +690,23 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
#ifndef WIN32 #ifndef WIN32
if (aok) { if (aok) {
if (feature_level) clear_line(); if (feature_level) clear_line();
printf("%s%s", colors[level], handle->last_event->body); if(!(global_profile->batch_mode)) {
if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR); printf("%s%s", colors[level], handle->last_event->body);
if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR);
} else {
printf("%s", handle->last_event->body);
}
if (feature_level) redisplay(); if (feature_level) redisplay();
} }
#else #else
if (aok) { if (aok) {
SetConsoleTextAttribute(hStdout, colors[level]); if(!(global_profile->batch_mode)) {
SetConsoleTextAttribute(hStdout, colors[level]);
}
WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL);
SetConsoleTextAttribute(hStdout, wOldColorAttrs); if(!(global_profile->batch_mode)) {
SetConsoleTextAttribute(hStdout, wOldColorAttrs);
}
} }
#endif #endif
} }
@ -831,20 +849,27 @@ static int get_profile(const char *name, cli_profile_t **profile)
return -1; return -1;
} }
#ifndef HAVE_EDITLINE
static char command_buf[CMD_BUFLEN+1] = ""; static char command_buf[CMD_BUFLEN+1] = "";
static const char *basic_gets(int *cnt) static const char *basic_gets(int *cnt)
{ {
#ifndef _MSC_VER
int x = 0; int x = 0;
#ifdef _MSC_VER
int read, key;
char keys[CMD_BUFLEN];
HANDLE stdinHandle;
if (global_profile->batch_mode) {
#endif
printf("%s", prompt_str); printf("%s", prompt_str);
if (global_profile->batch_mode) fflush(stdout);
memset(&command_buf, 0, sizeof(command_buf)); memset(&command_buf, 0, sizeof(command_buf));
for (x = 0; x < (sizeof(command_buf) - 1); x++) { for (x = 0; x < (sizeof(command_buf) - 1); x++) {
int c = getchar(); int c = getchar();
if (c < 0) { if (c < 0) {
int y = read(fileno(stdin), command_buf, sizeof(command_buf) - 1); if (fgets(command_buf, sizeof(command_buf) - 1, stdin) != command_buf) {
command_buf[y - 1] = '\0'; break;
}
command_buf[strlen(command_buf)-1] = '\0'; /* remove endline */
break; break;
} }
command_buf[x] = (char) c; command_buf[x] = (char) c;
@ -854,27 +879,28 @@ static const char *basic_gets(int *cnt)
} }
} }
*cnt = x; *cnt = x;
#else #ifdef _MSC_VER
int read, key; } else {
char keys[CMD_BUFLEN]; stdinHandle = GetStdHandle(STD_INPUT_HANDLE);
HANDLE stdinHandle = GetStdHandle(STD_INPUT_HANDLE); console_bufferInput (0, 0, prompt_str, PROMPT_OP);
console_bufferInput (0, 0, prompt_str, PROMPT_OP); printf("%s", prompt_str);
printf("%s", prompt_str); if (global_profile->batch_mode) fflush(stdout);
*cnt = 0; *cnt = 0;
memset(&command_buf, 0, sizeof(command_buf)); memset(&command_buf, 0, sizeof(command_buf));
while (!*cnt) { while (!*cnt) {
if (console_readConsole(stdinHandle, keys, (int)sizeof(keys), &read, &key)) { if (console_readConsole(stdinHandle, keys, (int)sizeof(keys), &read, &key)) {
*cnt = console_bufferInput(keys, read, command_buf, key); *cnt = console_bufferInput(keys, read, command_buf, key);
if (!strcmp(command_buf, "Empty")) { if (global_profile->batch_mode) fflush(stdout);
command_buf[0] = 0; if (!strcmp(command_buf, "Empty")) {
command_buf[0] = 0;
}
} }
sleep_ms(20);
} }
sleep_ms(20);
} }
#endif #endif
return command_buf; return command_buf;
} }
#endif
static const char *banner = static const char *banner =
" _____ ____ ____ _ ___ \n" " _____ ____ ____ _ ___ \n"
@ -1077,6 +1103,8 @@ static void read_config(const char *dft_cfile, const char *cfile) {
if (pt > 0) { if (pt > 0) {
profiles[pcount-1].port = (esl_port_t)pt; profiles[pcount-1].port = (esl_port_t)pt;
} }
} else if (!strcasecmp(var, "batchmode")) {
profiles[pcount-1].batch_mode = esl_true(val);
} else if (!strcasecmp(var, "debug")) { } else if (!strcasecmp(var, "debug")) {
int dt = atoi(val); int dt = atoi(val);
if (dt > -1 && dt < 8){ if (dt > -1 && dt < 8){
@ -1110,6 +1138,7 @@ static void clear_el_buffer(void) {
#ifdef HAVE_EDITLINE #ifdef HAVE_EDITLINE
const LineInfo *lf = el_line(el); const LineInfo *lf = el_line(el);
int len = (int)(lf->lastchar - lf->buffer); int len = (int)(lf->lastchar - lf->buffer);
if (global_profile->batch_mode) return;
el_deletestr(el, len); el_deletestr(el, len);
memset((char*)lf->buffer, 0, len); memset((char*)lf->buffer, 0, len);
#endif #endif
@ -1144,6 +1173,7 @@ int main(int argc, char *argv[])
{"execute", 1, 0, 'x'}, {"execute", 1, 0, 'x'},
{"loglevel", 1, 0, 'l'}, {"loglevel", 1, 0, 'l'},
{"quiet", 0, 0, 'q'}, {"quiet", 0, 0, 'q'},
{"batchmode", 0, 0, 'b'},
{"retry", 0, 0, 'r'}, {"retry", 0, 0, 'r'},
{"interrupt", 0, 0, 'i'}, {"interrupt", 0, 0, 'i'},
{"reconnect", 0, 0, 'R'}, {"reconnect", 0, 0, 'R'},
@ -1164,6 +1194,7 @@ int main(int argc, char *argv[])
char argv_command[1024] = ""; char argv_command[1024] = "";
char argv_loglevel[128] = ""; char argv_loglevel[128] = "";
int argv_quiet = 0; int argv_quiet = 0;
int argv_batch = 0;
int loops = 2, reconnect = 0, timeout = 0; int loops = 2, reconnect = 0, timeout = 0;
@ -1195,7 +1226,7 @@ int main(int argc, char *argv[])
esl_global_set_default_logger(6); /* default debug level to 6 (info) */ esl_global_set_default_logger(6); /* default debug level to 6 (info) */
for(;;) { for(;;) {
int option_index = 0; int option_index = 0;
opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhi?", options, &option_index); opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhib?", options, &option_index);
if (opt == -1) break; if (opt == -1) break;
switch (opt) { switch (opt) {
case 'H': case 'H':
@ -1238,6 +1269,9 @@ int main(int argc, char *argv[])
case 'q': case 'q':
argv_quiet = 1; argv_quiet = 1;
break; break;
case 'b':
argv_batch = 1;
break;
case 'i': case 'i':
allow_ctl_c = 1; allow_ctl_c = 1;
break; break;
@ -1288,6 +1322,10 @@ int main(int argc, char *argv[])
if (argv_pass) { if (argv_pass) {
esl_set_string(profile->pass, temp_pass); esl_set_string(profile->pass, temp_pass);
} }
if (argv_batch || profile->batch_mode) {
profile->batch_mode = 1;
feature_level=0;
}
if (*argv_loglevel) { if (*argv_loglevel) {
esl_set_string(profile->loglevel, argv_loglevel); esl_set_string(profile->loglevel, argv_loglevel);
profile->quiet = 0; profile->quiet = 0;
@ -1428,15 +1466,22 @@ int main(int argc, char *argv[])
snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel); snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel);
esl_send_recv(&handle, cmd_str); esl_send_recv(&handle, cmd_str);
} }
if (global_profile->batch_mode) {
setvbuf(stdout, (char*)NULL, _IONBF, 0);
}
print_banner(stdout); print_banner(stdout);
esl_log(ESL_LOG_INFO, "FS CLI Ready.\nenter /help for a list of commands.\n"); esl_log(ESL_LOG_INFO, "FS CLI Ready.\nenter /help for a list of commands.\n");
output_printf("%s\n", handle.last_sr_reply); output_printf("%s\n", handle.last_sr_reply);
while (running > 0) { while (running > 0) {
int r; int r;
#ifdef HAVE_EDITLINE #ifdef HAVE_EDITLINE
line = el_gets(el, &count); if (!(global_profile->batch_mode)) {
#else line = el_gets(el, &count);
} else {
#endif
line = basic_gets(&count); line = basic_gets(&count);
#ifdef HAVE_EDITLINE
}
#endif #endif
if (count > 1 && !esl_strlen_zero(line)) { if (count > 1 && !esl_strlen_zero(line)) {
char *p, *cmd = strdup(line); char *p, *cmd = strdup(line);