diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-14 18:47:44 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-14 18:47:44 +0000 |
| commit | 0fecfb254c5cfbd562870cf6d17e6925ccbdbeb7 (patch) | |
| tree | 4621fc48e6679b15b0f506ef023841d19e3abc48 /main | |
| parent | 6af365b47c5afc46f6a032aa6f4599e08a4fa174 (diff) | |
After reading Russell's e-mail to the dev list stating that checking option_verbose is not
equivalent to the check done by ast_verb, I wrote a macro, VERBOSITY_LEVEL, which does this
check. I did a quick look in the source and used this macro in some places where option_verbose
was used.
I also converted some verbose messages in logger.c to use ast_verb instead of ast_verbose.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93042 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/logger.c | 6 | ||||
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/main/logger.c b/main/logger.c index a1769f2e7..c82862e6b 100644 --- a/main/logger.c +++ b/main/logger.c @@ -586,8 +586,7 @@ static int reload_logger(int rotate) eventlog = fopen(old, "a"); if (eventlog) { ast_log(LOG_EVENT, "Restarted Asterisk Event Logger\n"); - if (option_verbose) - ast_verbose("Asterisk Event Logger restarted\n"); + ast_verb(1, "Asterisk Event Logger restarted\n"); } else { ast_log(LOG_ERROR, "Unable to create event log: %s\n", strerror(errno)); res = -1; @@ -605,8 +604,7 @@ static int reload_logger(int rotate) ast_queue_log("NONE", "NONE", "NONE", "CONFIGRELOAD", "%s", ""); AST_RWLIST_WRLOCK(&logchannels); ast_log(LOG_EVENT, "Restarted Asterisk Queue Logger\n"); - if (option_verbose) - ast_verbose("Asterisk Queue Logger restarted\n"); + ast_verb(1, "Asterisk Queue Logger restarted\n"); } else { ast_log(LOG_ERROR, "Unable to create queue log: %s\n", strerror(errno)); res = -1; diff --git a/main/manager.c b/main/manager.c index 4f93e9841..28158f482 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 && (option_verbose > 1) && manager_displayconnects(s)) { + if (s->authenticated && (VERBOSITY_LEVEL(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 e0a55ef3a..cc269f3f1 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 (option_verbose > 2) { + if (VERBOSITY_LEVEL(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, |