From ae8cc3e18be72c2e074ed33d7cfdc172f8e5f3b1 Mon Sep 17 00:00:00 2001
From: Matt O'Gorman <mogorman@digium.com>
Date: Tue, 3 Oct 2006 15:53:07 +0000
Subject: 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
---
 cdr/cdr_csv.c  | 10 +++++++---
 cdr/cdr_odbc.c | 18 ++++++++++++------
 cdr/cdr_tds.c  |  3 ++-
 3 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'cdr')

diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 350620315..ffbfee27b 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -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");
 		}
 	}
 
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 6ff12120c..f916a8d85 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -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;
 	}
 
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 2ac8481a8..b4d51729a 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -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);
-- 
cgit v1.2.3