diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-14 18:54:48 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-14 18:54:48 +0000 |
| commit | 3838d4b2c6898c9f5160abf6f95df057fbaeb532 (patch) | |
| tree | 146eed22bfe8d08cab8da0dfa31ae4a6fd0b4217 | |
| parent | 0fecfb254c5cfbd562870cf6d17e6925ccbdbeb7 (diff) | |
Changed VERBOSITY_LEVEL to VERBOSITY_ATLEAST to be more accurate.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93063 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | funcs/func_timeout.c | 2 | ||||
| -rw-r--r-- | include/asterisk/logger.h | 4 | ||||
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 5bff202e2..23c06dbaa 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -106,7 +106,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, case 'a': case 'A': ast_channel_setwhentohangup(chan, x); - if (VERBOSITY_LEVEL(2)) { + if (VERBOSITY_ATLEAST(2)) { if (chan->whentohangup) { struct timeval tv = { chan->whentohangup, 0 }; ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z", diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h index 09c099f06..d76aa932f 100644 --- a/include/asterisk/logger.h +++ b/include/asterisk/logger.h @@ -154,10 +154,10 @@ unsigned int ast_verbose_get_by_file(const char *file); ast_log(LOG_DEBUG, __VA_ARGS__); \ } 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 { \ - if (VERBOSITY_LEVEL((level)) ) { \ + if (VERBOSITY_ATLEAST((level)) ) { \ if (level >= 4) \ ast_verbose(VERBOSE_PREFIX_4 __VA_ARGS__); \ else if (level == 3) \ diff --git a/main/manager.c b/main/manager.c index 28158f482..e7e40340b 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2677,7 +2677,7 @@ static void purge_sessions(int n_max) if (s->sessiontimeout && (now > s->sessiontimeout) && !s->inuse) { AST_LIST_REMOVE_CURRENT(list); 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", s->username, ast_inet_ntoa(s->sin.sin_addr)); } diff --git a/main/pbx.c b/main/pbx.c index cc269f3f1..579defe2a 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2649,7 +2649,7 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, c->priority = priority; pbx_substitute_variables(passdata, sizeof(passdata), c, e); 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]; ast_verb(3, "Executing [%s@%s:%d] %s(\"%s\", \"%s\") %s\n", exten, context, priority, |