kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "CLI: Remove special handling of 'core set verbose' from rasterisk."

Browse Source
This commit is contained in:
George Joseph
2017-12-18 14:42:39 -06:00
committed by Gerrit Code Review
parent 5224fd3ab4 5f6a3c4399
commit 08440fd1d9
1 changed files with 3 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
main/asterisk.c
View File

@@ -2391,52 +2391,6 @@ static int remoteconsolehandler(const char *s)
(s[4] == '\0' || isspace(s[4]))) {
quit_handler(0, SHUTDOWN_FAST, 0);
ret = 1;
} else if (s[0]) {
char *shrunk = ast_strdupa(s);
char *cur;
char *prev;
/*
* Remove duplicate spaces from shrunk for matching purposes.
*
* shrunk has at least one character in it to start with or we
* couldn't get here.
*/
for (prev = shrunk, cur = shrunk + 1; *cur; ++cur) {
if (*prev == ' ' && *cur == ' ') {
/* Skip repeated space delimiter. */
continue;
}
*++prev = *cur;
}
*++prev = '\0';
if (strncasecmp(shrunk, "core set verbose ", 17) == 0) {
/*
* We need to still set the rasterisk option_verbose in case we are
* talking to an earlier version which doesn't prefilter verbose
* levels. This is really a compromise as we should always take
* whatever the server sends.
*/
if (!strncasecmp(shrunk + 17, "off", 3)) {
ast_verb_console_set(0);
} else {
int verbose_new;
int atleast;
atleast = 8;
if (strncasecmp(shrunk + 17, "atleast ", atleast)) {
atleast = 0;
}
if (sscanf(shrunk + 17 + atleast, "%30d", &verbose_new) == 1) {
if (!atleast || ast_verb_console_get() < verbose_new) {
ast_verb_console_set(verbose_new);
}
}
}
}
}
return ret;
@@ -2760,6 +2714,9 @@ static void send_rasterisk_connect_commands(void)
fdsend(ast_consock, buf);
}
/* Leave verbose filtering to the server. */
option_verbose = INT_MAX;
if (!ast_opt_mute) {
fdsend(ast_consock, "logger mute silent");
} else {