<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7981">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pbx: Reduce verbosity while loading extensions<br><br>Each time the dial plan is reloaded, a lot of logs like these are generated:<br>"Added extension 'XXXXX' priority 1 to YYYYYYYYYYY"<br>This patch changes the log level for those logs.<br><br>ASTERISK-27084<br><br>Change-Id: I5662902161c50890997ddc56835d4cafb456c529<br>---<br>M CHANGES<br>M main/config.c<br>M main/pbx.c<br>3 files changed, 12 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/CHANGES b/CHANGES<br>index 2aa5e58..6e58928 100644<br>--- a/CHANGES<br>+++ b/CHANGES<br>@@ -12,6 +12,12 @@<br> --- Functionality changes from Asterisk 13.19.0 to Asterisk 13.20.0 ----------<br> ------------------------------------------------------------------------------<br> <br>+Core<br>+------------------<br>+ * During dialplan reload log messages are produced for each context,<br>+ extension and include. These messages are no longer printed by the<br>+ verbose loggers, they are now only logged as debug messages.<br>+<br> app_followme<br> ------------------<br> * Added a new prompt, connecting-prompt, which will be played<br>diff --git a/main/config.c b/main/config.c<br>index e686c23..d022b6a 100644<br>--- a/main/config.c<br>+++ b/main/config.c<br>@@ -2193,7 +2193,6 @@<br> /* If we get to this point, then we're loading regardless */<br> ast_clear_flag(&flags, CONFIG_FLAG_FILEUNCHANGED);<br> ast_debug(1, "Parsing %s\n", fn);<br>- ast_verb(2, "Parsing '%s': Found\n", fn);<br> while (!feof(f)) {<br> lineno++;<br> if (fgets(buf, sizeof(buf), f)) {<br>diff --git a/main/pbx.c b/main/pbx.c<br>index b313e05..8e58819 100644<br>--- a/main/pbx.c<br>+++ b/main/pbx.c<br>@@ -6142,15 +6142,14 @@<br> *local_contexts = tmp;<br> ast_hashtab_insert_safe(contexts_table, tmp); /*put this context into the tree */<br> ast_unlock_contexts();<br>- ast_verb(3, "Registered extension context '%s'; registrar: %s\n", tmp->name, registrar);<br> } else {<br> tmp->next = *local_contexts;<br> if (exttable)<br> ast_hashtab_insert_immediate(exttable, tmp); /*put this context into the tree */<br> <br> *local_contexts = tmp;<br>- ast_verb(3, "Registered extension context '%s'; registrar: %s\n", tmp->name, registrar);<br> }<br>+ ast_debug(1, "Registered extension context '%s'; registrar: %s\n", tmp->name, registrar);<br> return tmp;<br> }<br> <br>@@ -6177,7 +6176,7 @@<br> struct ast_ignorepat *ip;<br> struct ast_sw *sw;<br> <br>- ast_verb(3, "merging incls/swits/igpats from old(%s) to new(%s) context, registrar = %s\n", ast_get_context_name(old), ast_get_context_name(new), registrar);<br>+ ast_debug(1, "merging incls/swits/igpats from old(%s) to new(%s) context, registrar = %s\n", ast_get_context_name(old), ast_get_context_name(new), registrar);<br> /* copy in the includes, switches, and ignorepats */<br> /* walk through includes */<br> for (i = NULL; (i = ast_walk_context_includes(old, i)) ; ) {<br>@@ -6310,6 +6309,7 @@<br> struct ast_state_cb *thiscb;<br> struct ast_hashtab_iter *iter;<br> struct ao2_iterator i;<br>+ int ctx_count = 0;<br> struct timeval begintime;<br> struct timeval writelocktime;<br> struct timeval endlocktime;<br>@@ -6342,6 +6342,7 @@<br> <br> iter = ast_hashtab_start_traversal(contexts_table);<br> while ((tmp = ast_hashtab_next(iter))) {<br>+ ++ctx_count;<br> context_merge(extcontexts, exttable, tmp, registrar);<br> }<br> ast_hashtab_end_traversal(iter);<br>@@ -6514,6 +6515,7 @@<br> ft = ast_tvdiff_us(enddeltime, begintime);<br> ft /= 1000000.0;<br> ast_verb(3,"Total time merge_contexts_delete: %8.6f sec\n", ft);<br>+ ast_verb(3, "%s successfully loaded %d contexts (enable debug for details).\n", registrar, ctx_count);<br> }<br> <br> /*<br>@@ -6591,7 +6593,7 @@<br> il->next = new_include;<br> else<br> con->includes = new_include;<br>- ast_verb(3, "Including context '%s' in context '%s'\n", new_include->name, ast_get_context_name(con));<br>+ ast_debug(1, "Including context '%s' in context '%s'\n", new_include->name, ast_get_context_name(con));<br> <br> ast_unlock_context(con);<br> <br>@@ -7430,14 +7432,6 @@<br> ast_debug(1, "Added extension '%s' priority %d to %s (%p)\n",<br> tmp->name, tmp->priority, con->name, con);<br> }<br>- }<br>-<br>- if (tmp->matchcid == AST_EXT_MATCHCID_ON) {<br>- ast_verb(3, "Added extension '%s' priority %d (CID match '%s') to %s\n",<br>- tmp->name, tmp->priority, tmp->cidmatch_display, con->name);<br>- } else {<br>- ast_verb(3, "Added extension '%s' priority %d to %s\n",<br>- tmp->name, tmp->priority, con->name);<br> }<br> <br> return 0;<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7981">change 7981</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/7981"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5662902161c50890997ddc56835d4cafb456c529 </div>
<div style="display:none"> Gerrit-Change-Number: 7981 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benoît Dereck-Tricot <benoit.dereck-tricot@eyepea.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.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: Kevin Harwell <kharwell@digium.com> </div>