Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed VERBOSITY_LEVEL to VERBOSITY_ATLEAST to be more accurate.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Mark Michelson 18 years ago
parent 4f75e15665
commit 83f152b95c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
funcs/func_timeout.c
Unescape View File

@ -106,7 +106,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data,
case 'a': case 'a':
case 'A': case 'A':
ast_channel_setwhentohangup(chan, x); ast_channel_setwhentohangup(chan, x);
if (VERBOSITY_LEVEL(2)) { if (VERBOSITY_ATLEAST(2)) {
if (chan->whentohangup) { if (chan->whentohangup) {
struct timeval tv = { chan->whentohangup, 0 }; struct timeval tv = { chan->whentohangup, 0 };
ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z", ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z",

4
include/asterisk/logger.h
Unescape View File

@ -154,10 +154,10 @@ unsigned int ast_verbose_get_by_file(const char *file);
ast_log(LOG_DEBUG, __VA_ARGS__); \ ast_log(LOG_DEBUG, __VA_ARGS__); \
} while (0) } while (0)
#define VERBOSITY_LEVEL(level) (option_verbose >= (level) || (ast_opt_verb_file && ast_verbose_get_by_file(__FILE__) >= (level))) #define VERBOSITY_ATLEAST(level) (option_verbose >= (level) || (ast_opt_verb_file && ast_verbose_get_by_file(__FILE__) >= (level)))
#define ast_verb(level, ...) do { \ #define ast_verb(level, ...) do { \
if (VERBOSITY_LEVEL((level)) ) { \ if (VERBOSITY_ATLEAST((level)) ) { \
if (level >= 4) \ if (level >= 4) \
ast_verbose(VERBOSE_PREFIX_4 __VA_ARGS__); \ ast_verbose(VERBOSE_PREFIX_4 __VA_ARGS__); \
else if (level == 3) \ else if (level == 3) \

2
main/manager.c
Unescape View File

@ -2677,7 +2677,7 @@ static void purge_sessions(int n_max)
if (s->sessiontimeout && (now > s->sessiontimeout) && !s->inuse) { if (s->sessiontimeout && (now > s->sessiontimeout) && !s->inuse) {
AST_LIST_REMOVE_CURRENT(list); AST_LIST_REMOVE_CURRENT(list);
ast_atomic_fetchadd_int(&num_sessions, -1); ast_atomic_fetchadd_int(&num_sessions, -1);
if (s->authenticated && (VERBOSITY_LEVEL(1)) && manager_displayconnects(s)) { if (s->authenticated && (VERBOSITY_ATLEAST(1)) && manager_displayconnects(s)) {
ast_verb(2, "HTTP Manager '%s' timed out from %s\n", ast_verb(2, "HTTP Manager '%s' timed out from %s\n",
s->username, ast_inet_ntoa(s->sin.sin_addr)); s->username, ast_inet_ntoa(s->sin.sin_addr));
} }

2
main/pbx.c
Unescape View File

@ -2649,7 +2649,7 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
c->priority = priority; c->priority = priority;
pbx_substitute_variables(passdata, sizeof(passdata), c, e); pbx_substitute_variables(passdata, sizeof(passdata), c, e);
ast_debug(1, "Launching '%s'\n", app->name); ast_debug(1, "Launching '%s'\n", app->name);
if (VERBOSITY_LEVEL(2)) { if (VERBOSITY_ATLEAST(2)) {
char tmp[80], tmp2[80], tmp3[EXT_DATA_SIZE]; char tmp[80], tmp2[80], tmp3[EXT_DATA_SIZE];
ast_verb(3, "Executing [%s@%s:%d] %s(\"%s\", \"%s\") %s\n", ast_verb(3, "Executing [%s@%s:%d] %s(\"%s\", \"%s\") %s\n",
exten, context, priority, exten, context, priority,

Write Preview
Loading…
Cancel
Save