bug #8076 check option_debug before printing to debug channel.

patch provided in bugnote, with minor changes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-10-03 15:53:07 +00:00
parent c9c1613503
commit ae8cc3e18b
67 changed files with 1718 additions and 922 deletions

View File

@@ -45,6 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h"
#include "asterisk/cdr.h"
#include "asterisk/module.h"
#include "asterisk/options.h"
#include "asterisk/logger.h"
#include "asterisk/utils.h"
@@ -121,7 +122,8 @@ static int load_config(void)
if (tmp) {
usegmtime = ast_true(tmp);
if (usegmtime) {
ast_log(LOG_DEBUG, "logging time in GMT\n");
if (option_debug)
ast_log(LOG_DEBUG, "logging time in GMT\n");
}
}
@@ -129,7 +131,8 @@ static int load_config(void)
if (tmp) {
loguniqueid = ast_true(tmp);
if (loguniqueid) {
ast_log(LOG_DEBUG, "logging CDR field UNIQUEID\n");
if (option_debug)
ast_log(LOG_DEBUG, "logging CDR field UNIQUEID\n");
}
}
@@ -137,7 +140,8 @@ static int load_config(void)
if (tmp) {
loguserfield = ast_true(tmp);
if (loguserfield) {
ast_log(LOG_DEBUG, "logging CDR user-defined field\n");
if (option_debug)
ast_log(LOG_DEBUG, "logging CDR user-defined field\n");
}
}

View File

@@ -306,12 +306,15 @@ static int odbc_load_module(void)
if (tmp) {
loguniqueid = ast_true(tmp);
if (loguniqueid) {
ast_log(LOG_DEBUG,"cdr_odbc: Logging uniqueid\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_odbc: Logging uniqueid\n");
} else {
ast_log(LOG_DEBUG,"cdr_odbc: Not logging uniqueid\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_odbc: Not logging uniqueid\n");
}
} else {
ast_log(LOG_DEBUG,"cdr_odbc: Not logging uniqueid\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_odbc: Not logging uniqueid\n");
loguniqueid = 0;
}
@@ -319,12 +322,15 @@ static int odbc_load_module(void)
if (tmp) {
usegmtime = ast_true(tmp);
if (usegmtime) {
ast_log(LOG_DEBUG,"cdr_odbc: Logging in GMT\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_odbc: Logging in GMT\n");
} else {
ast_log(LOG_DEBUG,"cdr_odbc: Not logging in GMT\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_odbc: Not logging in GMT\n");
}
} else {
ast_log(LOG_DEBUG,"cdr_odbc: Not logging in GMT\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_odbc: Not logging in GMT\n");
usegmtime = 0;
}

View File

@@ -482,7 +482,8 @@ static int tds_load_module(void)
ptr = ast_variable_retrieve(cfg,"global","table");
if (ptr == NULL) {
ast_log(LOG_DEBUG,"cdr_tds: table not specified. Assuming cdr\n");
if (option_debug)
ast_log(LOG_DEBUG,"cdr_tds: table not specified. Assuming cdr\n");
ptr = "cdr";
}
table = strdup(ptr);