Skip to content

Commit f5378f6

Browse files
InterLinked1gtjoseph
authored andcommitted
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
1 parent 0699c27 commit f5378f6

File tree

8 files changed

+13
-11
lines changed

8 files changed

+13
-11
lines changed

apps/app_stack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ static int gosub_run(struct ast_channel *chan, const char *sub_args, int ignore_
10761076
ast_channel_name(chan), app_gosub, sub_args,
10771077
S_OR(pbx_builtin_getvar_helper(chan, "GOSUB_RETVAL"), ""));
10781078
} else {
1079-
ast_log(LOG_NOTICE, "%s Abnormal '%s(%s)' exit. Popping routine return locations.\n",
1079+
ast_log(LOG_WARNING, "%s Abnormal '%s(%s)' exit. Popping routine return locations.\n",
10801080
ast_channel_name(chan), app_gosub, sub_args);
10811081
balance_stack(chan);
10821082
pbx_builtin_setvar_helper(chan, "GOSUB_RETVAL", "");

apps/app_voicemail.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -11197,12 +11197,14 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
1119711197
password[0] = '\0';
1119811198
} else {
1119911199
if (ast_streamfile(chan, vm_password, ast_channel_language(chan))) {
11200-
ast_log(AST_LOG_WARNING, "Unable to stream password file\n");
11200+
if (!ast_check_hangup(chan)) {
11201+
ast_log(AST_LOG_WARNING, "Unable to stream password file\n");
11202+
}
1120111203
free_user(vmu);
1120211204
return -1;
1120311205
}
1120411206
if (ast_readstring(chan, password, sizeof(password) - 1, 2000, 10000, "#") < 0) {
11205-
ast_log(AST_LOG_WARNING, "Unable to read password\n");
11207+
ast_log(AST_LOG_NOTICE, "Unable to read password\n");
1120611208
free_user(vmu);
1120711209
return -1;
1120811210
} else if (password[0] == '*') {

channels/chan_dahdi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19411,7 +19411,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
1941119411
report_alarms = REPORT_SPAN_ALARMS;
1941219412
}
1941319413
} else if (!(options & PROC_DAHDI_OPT_NOWARN) )
19414-
ast_log(LOG_WARNING, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno);
19414+
ast_log(LOG_NOTICE, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno);
1941519415
}
1941619416

1941719417
if (dahdichan) {

channels/chan_iax2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3407,7 +3407,7 @@ static int send_packet(struct iax_frame *f)
34073407

34083408
/* Called with iaxsl held */
34093409
if (iaxdebug) {
3410-
ast_debug(3, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr));
3410+
ast_debug(8, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr));
34113411
}
34123412
if (f->transfer) {
34133413
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)
1036310363
}
1036410364
if (ast_test_flag64(iaxs[fr->callno], IAX_ENCRYPTED) && !decrypted) {
1036510365
if (decrypt_frame(fr->callno, fh, &f, &res)) {
10366-
ast_log(LOG_NOTICE, "Packet Decrypt Failed!\n");
10366+
ast_log(LOG_WARNING, "Packet Decrypt Failed!\n");
1036710367
ast_variables_destroy(ies.vars);
1036810368
ast_mutex_unlock(&iaxsl[fr->callno]);
1036910369
return 1;
@@ -12033,7 +12033,7 @@ static int socket_process_helper(struct iax2_thread *thread)
1203312033
iaxs[fr->callno]->last = fr->ts;
1203412034
#if 1
1203512035
if (iaxdebug)
12036-
ast_debug(3, "For call=%d, set last=%u\n", fr->callno, fr->ts);
12036+
ast_debug(8, "For call=%d, set last=%u\n", fr->callno, fr->ts);
1203712037
#endif
1203812038
}
1203912039

main/manager.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6204,7 +6204,7 @@ static int match_filter(struct mansession *s, char *eventdata)
62046204
if (manager_debug) {
62056205
ast_verbose("<-- Examining AMI event: -->\n%s\n", eventdata);
62066206
} else {
6207-
ast_debug(3, "Examining AMI event:\n%s\n", eventdata);
6207+
ast_debug(4, "Examining AMI event:\n%s\n", eventdata);
62086208
}
62096209
if (!ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) {
62106210
return 1; /* no filtering means match all */

main/stasis.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2298,7 +2298,7 @@ int stasis_message_type_declined(const char *name)
22982298
ao2_cleanup(name_in_declined);
22992299
ao2_ref(cfg, -1);
23002300
if (res) {
2301-
ast_log(LOG_NOTICE, "Declining to allocate Stasis message type '%s' due to configuration\n", name);
2301+
ast_debug(4, "Declining to allocate Stasis message type '%s' due to configuration\n", name);
23022302
}
23032303
return res;
23042304
}

res/res_pjsip/config_transport.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
742742
res = PJ_SUCCESS;
743743
} else if (!transport->allow_reload && perm_state) {
744744
/* We inherit the transport from perm state, untouched */
745-
ast_log(LOG_WARNING, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id);
745+
ast_log(LOG_NOTICE, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id);
746746
temp_state->state->transport = perm_state->state->transport;
747747
perm_state->state->transport = NULL;
748748
temp_state->state->factory = perm_state->state->factory;

res/res_pjsip/pjsip_options.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ static void qualify_contact_cb(void *token, pjsip_event *e)
806806

807807
if (ast_sip_push_task(contact_callback_data->aor_options->serializer,
808808
sip_options_contact_status_notify_task, contact_callback_data)) {
809-
ast_log(LOG_NOTICE, "Unable to queue contact status update for '%s' on AOR '%s', state will be incorrect\n",
809+
ast_log(LOG_WARNING, "Unable to queue contact status update for '%s' on AOR '%s', state will be incorrect\n",
810810
ast_sorcery_object_get_id(contact_callback_data->contact),
811811
contact_callback_data->aor_options->name);
812812
ao2_ref(contact_callback_data, -1);

0 commit comments

Comments
 (0)