kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace direct checks of option_debug with DEBUG_ATLEAST macro.

Browse Source 
Checking option_debug directly is incorrect as it ignores file/module
specific debug settings.  This system-wide change replaces nearly all
direct checks for option_debug with the DEBUG_ATLEAST macro.

Change-Id: Ic342d4799a945dbc40ac085ac142681094a4ebf0
This commit is contained in:
Corey Farrell
2018-03-07 01:29:13 -05:00
parent 7f864dbc36
commit b81eadcefc
16 changed files with 88 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_dahdi.c
View File

@@ -15167,14 +15167,14 @@ retry:
ast_mutex_lock(&p->lock);
if (p->owner && !p->restartpending) {
if (ast_channel_trylock(p->owner)) {
if (option_debug > 2)
if (DEBUG_ATLEAST(3))
ast_verbose("Avoiding deadlock\n");
/* Avoid deadlock since you're not supposed to lock iflock or pvt before a channel */
ast_mutex_unlock(&p->lock);
ast_mutex_unlock(&iflock);
goto retry;
}
if (option_debug > 2)
if (DEBUG_ATLEAST(3))
ast_verbose("Softhanging up on %s\n", ast_channel_name(p->owner));
ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_EXPLICIT);
p->restartpending = 1;

14
channels/chan_sip.c
View File

@@ -22332,7 +22332,7 @@ static void sip_dump_history(struct sip_pvt *dialog)
return;
}
if (!option_debug && !sipdebug) {
if (!sipdebug && !DEBUG_ATLEAST(1)) {
if (!errmsg) {
ast_log(LOG_NOTICE, "You must have debugging enabled (SIP or Asterisk) in order to dump SIP history.\n");
errmsg = 1;
@@ -22340,20 +22340,20 @@ static void sip_dump_history(struct sip_pvt *dialog)
return;
}
ast_debug(1, "\n---------- SIP HISTORY for '%s' \n", dialog->callid);
ast_log(LOG_DEBUG, "\n---------- SIP HISTORY for '%s' \n", dialog->callid);
if (dialog->subscribed) {
ast_debug(1, " * Subscription\n");
ast_log(LOG_DEBUG, " * Subscription\n");
} else {
ast_debug(1, " * SIP Call\n");
ast_log(LOG_DEBUG, " * SIP Call\n");
}
if (dialog->history) {
AST_LIST_TRAVERSE(dialog->history, hist, list)
ast_debug(1, " %-3.3d. %s\n", ++x, hist->event);
ast_log(LOG_DEBUG, " %-3.3d. %s\n", ++x, hist->event);
}
if (!x) {
ast_debug(1, "Call '%s' has no history\n", dialog->callid);
ast_log(LOG_DEBUG, "Call '%s' has no history\n", dialog->callid);
}
ast_debug(1, "\n---------- END SIP HISTORY for '%s' \n", dialog->callid);
ast_log(LOG_DEBUG, "\n---------- END SIP HISTORY for '%s' \n", dialog->callid);
}