<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7561">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve; Approved for Submit
  Joshua Colp: Looks good to me, approved
  Richard Mudgett: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CLI: Remove special handling of 'core set verbose' from rasterisk.<br><br>rasterisk does not need to handle setting verbose levels locally, it<br>should just tell the daemon what it wants and print what it is given.<br>Just max out the verbose level on the local client so all filtering<br>happens on the daemon.<br><br>ASTERISK-20281 #close<br><br>Change-Id: Ia305f75f1fc424a9169bfa30ef70d626ace2c8a8<br>---<br>M main/asterisk.c<br>1 file changed, 3 insertions(+), 46 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/asterisk.c b/main/asterisk.c<br>index 5c658d0..92398b7 100644<br>--- a/main/asterisk.c<br>+++ b/main/asterisk.c<br>@@ -2387,52 +2387,6 @@<br>      (s[4] == '\0' || isspace(s[4]))) {<br>                quit_handler(0, SHUTDOWN_FAST, 0);<br>            ret = 1;<br>-     } else if (s[0]) {<br>-           char *shrunk = ast_strdupa(s);<br>-               char *cur;<br>-           char *prev;<br>-<br>-               /*<br>-            * Remove duplicate spaces from shrunk for matching purposes.<br>-                 *<br>-            * shrunk has at least one character in it to start with or we<br>-                * couldn't get here.<br>-             */<br>-          for (prev = shrunk, cur = shrunk + 1; *cur; ++cur) {<br>-                 if (*prev == ' ' && *cur == ' ') {<br>-                           /* Skip repeated space delimiter. */<br>-                         continue;<br>-                    }<br>-                    *++prev = *cur;<br>-              }<br>-            *++prev = '\0';<br>-<br>-           if (strncasecmp(shrunk, "core set verbose ", 17) == 0) {<br>-                   /*<br>-                    * We need to still set the rasterisk option_verbose in case we are<br>-                   * talking to an earlier version which doesn't prefilter verbose<br>-                  * levels.  This is really a compromise as we should always take<br>-                      * whatever the server sends.<br>-                         */<br>-<br>-                       if (!strncasecmp(shrunk + 17, "off", 3)) {<br>-                         ast_verb_console_set(0);<br>-                     } else {<br>-                             int verbose_new;<br>-                             int atleast;<br>-<br>-                              atleast = 8;<br>-                         if (strncasecmp(shrunk + 17, "atleast ", atleast)) {<br>-                                       atleast = 0;<br>-                         }<br>-<br>-                         if (sscanf(shrunk + 17 + atleast, "%30d", &verbose_new) == 1) {<br>-                                        if (!atleast || ast_verb_console_get() < verbose_new) {<br>-                                           ast_verb_console_set(verbose_new);<br>-                                   }<br>-                            }<br>-                    }<br>-            }<br>     }<br> <br>  return ret;<br>@@ -2756,6 +2710,9 @@<br>            fdsend(ast_consock, buf);<br>     }<br> <br>+ /* Leave verbose filtering to the server. */<br>+ option_verbose = INT_MAX;<br>+<br>  if (!ast_opt_mute) {<br>          fdsend(ast_consock, "logger mute silent");<br>  } else {<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7561">change 7561</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7561"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia305f75f1fc424a9169bfa30ef70d626ace2c8a8 </div>
<div style="display:none"> Gerrit-Change-Number: 7561 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>