From 08afdcbd304decfd864d36814e5cdf0ee6d90f1b Mon Sep 17 00:00:00 2001 From: Naveen Albert Date: Fri, 22 Jul 2022 20:57:05 +0000 Subject: [PATCH] general: Improve logging levels of some log messages. Adjusts some logging levels to be more or less important, that is more prominent when actual problems occur and less prominent for less noteworthy things. ASTERISK-30153 #close Change-Id: Ifc8f7df427aa018627db462125ae744986d3261b --- apps/app_stack.c | 2 +- apps/app_voicemail.c | 6 ++++-- channels/chan_dahdi.c | 2 +- channels/chan_iax2.c | 6 +++--- main/manager.c | 2 +- main/stasis.c | 2 +- res/res_pjsip/config_transport.c | 2 +- res/res_pjsip/pjsip_options.c | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/apps/app_stack.c b/apps/app_stack.c index 557c6f160f..a84a45c1b4 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -1076,7 +1076,7 @@ static int gosub_run(struct ast_channel *chan, const char *sub_args, int ignore_ ast_channel_name(chan), app_gosub, sub_args, S_OR(pbx_builtin_getvar_helper(chan, "GOSUB_RETVAL"), "")); } else { - ast_log(LOG_NOTICE, "%s Abnormal '%s(%s)' exit. Popping routine return locations.\n", + ast_log(LOG_WARNING, "%s Abnormal '%s(%s)' exit. Popping routine return locations.\n", ast_channel_name(chan), app_gosub, sub_args); balance_stack(chan); pbx_builtin_setvar_helper(chan, "GOSUB_RETVAL", ""); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 5436c87e23..510e15d788 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -11197,12 +11197,14 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_ password[0] = '\0'; } else { if (ast_streamfile(chan, vm_password, ast_channel_language(chan))) { - ast_log(AST_LOG_WARNING, "Unable to stream password file\n"); + if (!ast_check_hangup(chan)) { + ast_log(AST_LOG_WARNING, "Unable to stream password file\n"); + } free_user(vmu); return -1; } if (ast_readstring(chan, password, sizeof(password) - 1, 2000, 10000, "#") < 0) { - ast_log(AST_LOG_WARNING, "Unable to read password\n"); + ast_log(AST_LOG_NOTICE, "Unable to read password\n"); free_user(vmu); return -1; } else if (password[0] == '*') { diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 5adb797a5a..8ce0526f4d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -19411,7 +19411,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct report_alarms = REPORT_SPAN_ALARMS; } } else if (!(options & PROC_DAHDI_OPT_NOWARN) ) - ast_log(LOG_WARNING, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno); + ast_log(LOG_NOTICE, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno); } if (dahdichan) { diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 6ff1896a7e..0b58a2b45b 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3407,7 +3407,7 @@ static int send_packet(struct iax_frame *f) /* Called with iaxsl held */ if (iaxdebug) { - ast_debug(3, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr)); + ast_debug(8, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr)); } if (f->transfer) { iax_outputframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr)); @@ -10363,7 +10363,7 @@ static int socket_process_helper(struct iax2_thread *thread) } if (ast_test_flag64(iaxs[fr->callno], IAX_ENCRYPTED) && !decrypted) { if (decrypt_frame(fr->callno, fh, &f, &res)) { - ast_log(LOG_NOTICE, "Packet Decrypt Failed!\n"); + ast_log(LOG_WARNING, "Packet Decrypt Failed!\n"); ast_variables_destroy(ies.vars); ast_mutex_unlock(&iaxsl[fr->callno]); return 1; @@ -12033,7 +12033,7 @@ immediatedial: iaxs[fr->callno]->last = fr->ts; #if 1 if (iaxdebug) - ast_debug(3, "For call=%d, set last=%u\n", fr->callno, fr->ts); + ast_debug(8, "For call=%d, set last=%u\n", fr->callno, fr->ts); #endif } diff --git a/main/manager.c b/main/manager.c index 9645bd6fed..78a8eb9b43 100644 --- a/main/manager.c +++ b/main/manager.c @@ -6204,7 +6204,7 @@ static int match_filter(struct mansession *s, char *eventdata) if (manager_debug) { ast_verbose("<-- Examining AMI event: -->\n%s\n", eventdata); } else { - ast_debug(3, "Examining AMI event:\n%s\n", eventdata); + ast_debug(4, "Examining AMI event:\n%s\n", eventdata); } if (!ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) { return 1; /* no filtering means match all */ diff --git a/main/stasis.c b/main/stasis.c index cf89a9980b..a7cc7e2f16 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -2298,7 +2298,7 @@ int stasis_message_type_declined(const char *name) ao2_cleanup(name_in_declined); ao2_ref(cfg, -1); if (res) { - ast_log(LOG_NOTICE, "Declining to allocate Stasis message type '%s' due to configuration\n", name); + ast_debug(4, "Declining to allocate Stasis message type '%s' due to configuration\n", name); } return res; } diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index 38bbecb9cf..af0e0c937f 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -742,7 +742,7 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj) res = PJ_SUCCESS; } else if (!transport->allow_reload && perm_state) { /* We inherit the transport from perm state, untouched */ - ast_log(LOG_WARNING, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id); + ast_log(LOG_NOTICE, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id); temp_state->state->transport = perm_state->state->transport; perm_state->state->transport = NULL; temp_state->state->factory = perm_state->state->factory; diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c index 14013ade5a..4f48257789 100644 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@ -806,7 +806,7 @@ static void qualify_contact_cb(void *token, pjsip_event *e) if (ast_sip_push_task(contact_callback_data->aor_options->serializer, sip_options_contact_status_notify_task, contact_callback_data)) { - ast_log(LOG_NOTICE, "Unable to queue contact status update for '%s' on AOR '%s', state will be incorrect\n", + ast_log(LOG_WARNING, "Unable to queue contact status update for '%s' on AOR '%s', state will be incorrect\n", ast_sorcery_object_get_id(contact_callback_data->contact), contact_callback_data->aor_options->name); ao2_ref(contact_callback_data, -1);