<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18909">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Benjamin Keith Ford: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">general: Improve logging levels of some log messages.<br><br>Adjusts some logging levels to be more or less important,<br>that is more prominent when actual problems occur and less<br>prominent for less noteworthy things.<br><br>ASTERISK-30153 #close<br><br>Change-Id: Ifc8f7df427aa018627db462125ae744986d3261b<br>---<br>M apps/app_stack.c<br>M apps/app_voicemail.c<br>M channels/chan_dahdi.c<br>M channels/chan_iax2.c<br>M main/manager.c<br>M main/stasis.c<br>M res/res_pjsip/config_transport.c<br>M res/res_pjsip/pjsip_options.c<br>8 files changed, 13 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_stack.c b/apps/app_stack.c</span><br><span>index 557c6f1..a84a45c 100644</span><br><span>--- a/apps/app_stack.c</span><br><span>+++ b/apps/app_stack.c</span><br><span>@@ -1076,7 +1076,7 @@</span><br><span> ast_channel_name(chan), app_gosub, sub_args,</span><br><span> S_OR(pbx_builtin_getvar_helper(chan, "GOSUB_RETVAL"), ""));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_NOTICE, "%s Abnormal '%s(%s)' exit. Popping routine return locations.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_WARNING, "%s Abnormal '%s(%s)' exit. Popping routine return locations.\n",</span><br><span> ast_channel_name(chan), app_gosub, sub_args);</span><br><span> balance_stack(chan);</span><br><span> pbx_builtin_setvar_helper(chan, "GOSUB_RETVAL", "");</span><br><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index 5436c87..510e15d 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -11197,12 +11197,14 @@</span><br><span> password[0] = '\0';</span><br><span> } else {</span><br><span> if (ast_streamfile(chan, vm_password, ast_channel_language(chan))) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(AST_LOG_WARNING, "Unable to stream password file\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_check_hangup(chan)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(AST_LOG_WARNING, "Unable to stream password file\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> free_user(vmu);</span><br><span> return -1;</span><br><span> }</span><br><span> if (ast_readstring(chan, password, sizeof(password) - 1, 2000, 10000, "#") < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(AST_LOG_WARNING, "Unable to read password\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(AST_LOG_NOTICE, "Unable to read password\n");</span><br><span> free_user(vmu);</span><br><span> return -1;</span><br><span> } else if (password[0] == '*') {</span><br><span>diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c</span><br><span>index 5adb797..8ce0526 100644</span><br><span>--- a/channels/chan_dahdi.c</span><br><span>+++ b/channels/chan_dahdi.c</span><br><span>@@ -19411,7 +19411,7 @@</span><br><span> report_alarms = REPORT_SPAN_ALARMS;</span><br><span> }</span><br><span> } else if (!(options & PROC_DAHDI_OPT_NOWARN) )</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_WARNING, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_NOTICE, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno);</span><br><span> }</span><br><span> </span><br><span> if (dahdichan) {</span><br><span>diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c</span><br><span>index 6ff1896..0b58a2b 100644</span><br><span>--- a/channels/chan_iax2.c</span><br><span>+++ b/channels/chan_iax2.c</span><br><span>@@ -3407,7 +3407,7 @@</span><br><span> </span><br><span> /* Called with iaxsl held */</span><br><span> if (iaxdebug) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(3, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(8, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr));</span><br><span> }</span><br><span> if (f->transfer) {</span><br><span> iax_outputframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr));</span><br><span>@@ -10363,7 +10363,7 @@</span><br><span> }</span><br><span> if (ast_test_flag64(iaxs[fr->callno], IAX_ENCRYPTED) && !decrypted) {</span><br><span> if (decrypt_frame(fr->callno, fh, &f, &res)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_NOTICE, "Packet Decrypt Failed!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_WARNING, "Packet Decrypt Failed!\n");</span><br><span> ast_variables_destroy(ies.vars);</span><br><span> ast_mutex_unlock(&iaxsl[fr->callno]);</span><br><span> return 1;</span><br><span>@@ -12033,7 +12033,7 @@</span><br><span> iaxs[fr->callno]->last = fr->ts;</span><br><span> #if 1</span><br><span> if (iaxdebug)</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(3, "For call=%d, set last=%u\n", fr->callno, fr->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(8, "For call=%d, set last=%u\n", fr->callno, fr->ts);</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span>diff --git a/main/manager.c b/main/manager.c</span><br><span>index 9645bd6..78a8eb9b 100644</span><br><span>--- a/main/manager.c</span><br><span>+++ b/main/manager.c</span><br><span>@@ -6204,7 +6204,7 @@</span><br><span> if (manager_debug) {</span><br><span> ast_verbose("<-- Examining AMI event: -->\n%s\n", eventdata);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(3, "Examining AMI event:\n%s\n", eventdata);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(4, "Examining AMI event:\n%s\n", eventdata);</span><br><span> }</span><br><span> if (!ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) {</span><br><span> return 1; /* no filtering means match all */</span><br><span>diff --git a/main/stasis.c b/main/stasis.c</span><br><span>index cf89a99..a7cc7e2 100644</span><br><span>--- a/main/stasis.c</span><br><span>+++ b/main/stasis.c</span><br><span>@@ -2298,7 +2298,7 @@</span><br><span> ao2_cleanup(name_in_declined);</span><br><span> ao2_ref(cfg, -1);</span><br><span> if (res) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_NOTICE, "Declining to allocate Stasis message type '%s' due to configuration\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(4, "Declining to allocate Stasis message type '%s' due to configuration\n", name);</span><br><span> }</span><br><span> return res;</span><br><span> }</span><br><span>diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c</span><br><span>index 38bbecb..af0e0c9 100644</span><br><span>--- a/res/res_pjsip/config_transport.c</span><br><span>+++ b/res/res_pjsip/config_transport.c</span><br><span>@@ -742,7 +742,7 @@</span><br><span> res = PJ_SUCCESS;</span><br><span> } else if (!transport->allow_reload && perm_state) {</span><br><span> /* We inherit the transport from perm state, untouched */</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_WARNING, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_NOTICE, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id);</span><br><span> temp_state->state->transport = perm_state->state->transport;</span><br><span> perm_state->state->transport = NULL;</span><br><span> temp_state->state->factory = perm_state->state->factory;</span><br><span>diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c</span><br><span>index 14013ad..4f48257 100644</span><br><span>--- a/res/res_pjsip/pjsip_options.c</span><br><span>+++ b/res/res_pjsip/pjsip_options.c</span><br><span>@@ -806,7 +806,7 @@</span><br><span> </span><br><span> if (ast_sip_push_task(contact_callback_data->aor_options->serializer,</span><br><span> sip_options_contact_status_notify_task, contact_callback_data)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_NOTICE, "Unable to queue contact status update for '%s' on AOR '%s', state will be incorrect\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_WARNING, "Unable to queue contact status update for '%s' on AOR '%s', state will be incorrect\n",</span><br><span> ast_sorcery_object_get_id(contact_callback_data->contact),</span><br><span> contact_callback_data->aor_options->name);</span><br><span> ao2_ref(contact_callback_data, -1);</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18909">change 18909</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/18909"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Ifc8f7df427aa018627db462125ae744986d3261b </div>
<div style="display:none"> Gerrit-Change-Number: 18909 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: N A <mail@interlinked.x10host.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>