diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-18 13:41:07 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-18 13:41:07 -0600 |
commit | cbb71df228f5cd3543c4eef6f9eacb992bdd2c53 (patch) | |
tree | 91de55a44785cf42f3de65adb18b5b8f40a4ed9f | |
parent | 56a931f64c1340ab4a2c10ee363e86fd106de4ca (diff) | |
parent | dd72844e4d675e0bd802da950fa43e0c1d16bf25 (diff) |
Merge "CLI: Remove special handling of 'core set verbose' from rasterisk." into 13
-rw-r--r-- | main/asterisk.c | 49 |
1 files changed, 3 insertions, 46 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 2e06f1984..015c9f35a 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2519,52 +2519,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; @@ -2889,6 +2843,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 { |