diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-03 15:53:07 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-03 15:53:07 +0000 |
| commit | 4a1aaf52ae4189e660ad57ba69253f54603a2beb (patch) | |
| tree | 27a80e26cf8f6ea1728ab5b2b8cc7573fd9f7cdc /apps/app_macro.c | |
| parent | 1bd1494da59a95dce73628aafc4ba892036b82b2 (diff) | |
bug #8076 check option_debug before printing to debug channel.
patch provided in bugnote, with minor changes.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44253 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
| -rw-r--r-- | apps/app_macro.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 21c2b7c62..861248c1e 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -164,7 +164,8 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) /* If we are to run the macro exclusively, take the mutex */ if (exclusive) { - ast_log(LOG_DEBUG, "Locking macrolock for '%s'\n", fullmacro); + if (option_debug) + ast_log(LOG_DEBUG, "Locking macrolock for '%s'\n", fullmacro); ast_autoservice_start(chan); if (ast_context_lockmacro(fullmacro)) { ast_log(LOG_WARNING, "Failed to lock macro '%s' as in-use\n", fullmacro); @@ -228,7 +229,8 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) || (res == '*') || (res == '#')) { /* Just return result as to the previous application as if it had been dialed */ - ast_log(LOG_DEBUG, "Oooh, got something to jump out with ('%c')!\n", res); + if (option_debug) + ast_log(LOG_DEBUG, "Oooh, got something to jump out with ('%c')!\n", res); break; } switch(res) { @@ -258,8 +260,9 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) } /* don't stop executing extensions when we're in "h" */ if (chan->_softhangup && strcasecmp(oldexten,"h") && strcasecmp(chan->macroexten,"h")) { - ast_log(LOG_DEBUG, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n", - chan->exten, chan->macroexten, chan->priority); + if (option_debug) + ast_log(LOG_DEBUG, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n", + chan->exten, chan->macroexten, chan->priority); goto out; } chan->priority++; @@ -330,7 +333,8 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) /* Unlock the macro */ if (exclusive) { - ast_log(LOG_DEBUG, "Unlocking macrolock for '%s'\n", fullmacro); + if (option_debug) + ast_log(LOG_DEBUG, "Unlocking macrolock for '%s'\n", fullmacro); if (ast_context_unlockmacro(fullmacro)) { ast_log(LOG_ERROR, "Failed to unlock macro '%s' - that isn't good\n", fullmacro); res = 0; |