summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-10-03 10:01:49 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-10-03 10:01:49 -0500
commit4fdc39bcfb98bbe54ade3d9692a7147bfe38d251 (patch)
tree0e797b7b154b6b19e20ba1049a18816a873f64d2
parent88ba803110d8e25d0f5286279ab4745d4a2512e3 (diff)
parent00fc98d3302ae6ed42bdb599512ef00f5c148465 (diff)
Merge "logger: Bring back ability to turn debug on by source file" into 14
-rw-r--r--include/asterisk/logger.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h
index 849f986b3..8b1e5fe01 100644
--- a/include/asterisk/logger.h
+++ b/include/asterisk/logger.h
@@ -429,7 +429,9 @@ void ast_callid_strnprint(char *buffer, size_t buffer_size, ast_callid callid);
#define DEBUG_ATLEAST(level) \
(option_debug >= (level) \
- || (ast_opt_dbg_module && (int)ast_debug_get_by_module(AST_MODULE) >= (level)))
+ || (ast_opt_dbg_module \
+ && ((int)ast_debug_get_by_module(AST_MODULE) >= (level) \
+ || (int)ast_debug_get_by_module(__FILE__) >= (level))))
/*!
* \brief Log a DEBUG message