diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 16:23:45 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-19 16:23:45 +0000 |
| commit | d5df46a93ee535f46c6e21dda422fa993620274d (patch) | |
| tree | a58a9222645e8ccbba65497c74d4df0ef7353d54 /main/pbx.c | |
| parent | a4b9dfccb4fc717972e6759a53d78a47babacf91 (diff) | |
similar patch for verbose vs debug with minor changes
bug 2617
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43272 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/pbx.c b/main/pbx.c index 977a284f1..5960df481 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2354,14 +2354,14 @@ static int __ast_pbx_run(struct ast_channel *c) if (res == AST_PBX_KEEPALIVE) { if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE on '%s'\n", c->context, c->exten, c->priority, c->name); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE on '%s'\n", c->context, c->exten, c->priority, c->name); error = 1; break; } if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) { c->_softhangup =0; @@ -2481,7 +2481,7 @@ static int __ast_pbx_run(struct ast_channel *c) /* Something bad happened, or a hangup has been requested. */ if (option_debug) ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); - else if (option_verbose > 1) + if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); break; } @@ -3822,7 +3822,7 @@ static struct ast_context *__ast_context_create(struct ast_context **extcontexts *local_contexts = tmp; if (option_debug) ast_log(LOG_DEBUG, "Registered context '%s'\n", tmp->name); - else if (option_verbose > 2) + if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Registered extension context '%s'\n", tmp->name); } @@ -4796,7 +4796,8 @@ int ast_add_extension2(struct ast_context *con, ast_log(LOG_DEBUG, "Added extension '%s' priority %d to %s\n", tmp->exten, tmp->priority, con->name); } - } else if (option_verbose > 2) { + } + if (option_verbose > 2) { if (tmp->matchcid) { ast_verbose( VERBOSE_PREFIX_3 "Added extension '%s' priority %d (CID match '%s')to %s\n", tmp->exten, tmp->priority, tmp->cidmatch, con->name); |