Allow clogging feature to be disabled.

11 files changed, 103 insertions, 44 deletions

diff --git a/etc/rc b/etc/rc
index dcb5d46..da85d19 100755
--- a/etc/rc
+++ b/etc/rc
@@ -155,28 +155,34 @@ rm /var/log/* 2>/dev/null
 rm -rf /var/run/*
 
 echo -n "."
-# generate circular logfiles
+DISABLESYSLOGCLOG=`cat /cf/conf/config.xml | grep disablesyslogclog | wc -l | awk '{ print $1 }'`
 if [ ! "$PLATFORM" = "cdrom" ]; then
-	clog -i -s 512144 /var/log/system.log
-	clog -i -s 512144 /var/log/filter.log
-	clog -i -s 65535 /var/log/dhcpd.log
-	clog -i -s 65535 /var/log/vpn.log
-	clog -i -s 65535 /var/log/openvpn.log
-	clog -i -s 65535 /var/log/portalauth.log
-	clog -i -s 65535 /var/log/ipsec.log
-	clog -i -s 65535 /var/log/slbd.log
-	clog -i -s 65535 /var/log/lighttpd.log
-	clog -i -s 65535 /var/log/ntpd.log
+	if [ "$DISABLESYSLOGCLOG" -lt "0" ]; then 
+		# generate circular logfiles
+		clog -i -s 512144 /var/log/system.log
+		clog -i -s 512144 /var/log/filter.log
+		clog -i -s 65535 /var/log/dhcpd.log
+		clog -i -s 65535 /var/log/vpn.log
+		clog -i -s 65535 /var/log/openvpn.log
+		clog -i -s 65535 /var/log/portalauth.log
+		clog -i -s 65535 /var/log/ipsec.log
+		clog -i -s 65535 /var/log/slbd.log
+		clog -i -s 65535 /var/log/lighttpd.log
+		clog -i -s 65535 /var/log/ntpd.log
+	fi 
 else
-    clog -i -s 65535 /var/log/system.log
-    clog -i -s 65535 /var/log/filter.log
-    clog -i -s 65535 /var/log/dhcpd.log
-    clog -i -s 65535 /var/log/vpn.log
-	clog -i -s 65535 /var/log/openvpn.log
-    clog -i -s 65535 /var/log/portalauth.log
-    clog -i -s 65535 /var/log/ipsec.log
-    clog -i -s 65535 /var/log/slbd.log
-	clog -i -s 65535 /var/log/ntpd.log
+	if [ "$DISABLESYSLOGCLOG" -lt "1" ]; then 
+		# generate circular logfiles
+	    clog -i -s 65535 /var/log/system.log
+	    clog -i -s 65535 /var/log/filter.log
+	    clog -i -s 65535 /var/log/dhcpd.log
+	    clog -i -s 65535 /var/log/vpn.log
+		clog -i -s 65535 /var/log/openvpn.log
+	    clog -i -s 65535 /var/log/portalauth.log
+	    clog -i -s 65535 /var/log/ipsec.log
+	    clog -i -s 65535 /var/log/slbd.log
+		clog -i -s 65535 /var/log/ntpd.log
+	fi
 fi
 
 # change permissions on newly created clog files.
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php
index ce0e7a7..8cf5b08 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -40,9 +40,17 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 262144 {$system_logfile}");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		exec("killall syslogd");
+		unlink($syslog_logfile);
+		touch($syslog_logfile);
+		system_syslogd_start();
+	} else {  
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 262144 {$system_logfile}");
+		system_syslogd_start();
+	}
+
 }
 
 if ($_GET['filtertext'])
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index 9025759..c7e5e69 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -38,7 +38,12 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}");
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink($portal_logfile);
+		touch($portal_logfile);
+	} else {
+		exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}");
+	}
 }
 
 $pgtitle = array("Status","System logs","Portal Auth");
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index e8b431a..c01f053 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -40,7 +40,12 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}");
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink($dhcpd_logfile);
+		touch($dhcpd_logfile);
+	} else {
+		exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}");
+	}
 }
 
 $pgtitle = array("Status","System logs","DHCP");
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 0e287dd..c1a3b6b 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -49,9 +49,14 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 512144 /var/log/filter.log");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink("/var/log/filter.log");
+		touch("/var/log/filter.log");
+	} else {	
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 512144 /var/log/filter.log");
+		system_syslogd_start();
+	}
 }
 
 /* format filter logs */
diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php
index 90f9fcc..81ffd3f 100755
--- a/usr/local/www/diag_logs_filter_dynamic.php
+++ b/usr/local/www/diag_logs_filter_dynamic.php
@@ -42,9 +42,14 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 262144 /var/log/filter.log");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink("/var/log/filter.log");
+		touch("/var/log/filter.log");
+	} else {
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 262144 /var/log/filter.log");
+		system_syslogd_start();
+	}
 }
 
 /* format filter logs */
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 079c025..94b8ae0 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -56,9 +56,14 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink($ipsec_logfile);
+		touch($ipsec_logfile);
+	} else {
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}");
+		system_syslogd_start();
+	}
 }
 
 $ipsec_logarr = return_clog($ipsec_logfile, $nentries);
diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php
index 3743af5..442d5c8 100644
--- a/usr/local/www/diag_logs_ntpd.php
+++ b/usr/local/www/diag_logs_ntpd.php
@@ -38,9 +38,14 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink($slbd_logfile);
+		touch($slbd_logfile);
+	} else {
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}");
+		system_syslogd_start();
+	}
 }
 
 $pgtitle = array("Status","System logs","OpenNTPD");
diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php
index 55ffee2..29261b8 100644
--- a/usr/local/www/diag_logs_openvpn.php
+++ b/usr/local/www/diag_logs_openvpn.php
@@ -42,9 +42,14 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 262144 {$openvpn_logfile}");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink($openvpn_logfile);
+		touch($openvpn_logfile);
+	} else {
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 262144 {$openvpn_logfile}");
+		system_syslogd_start();
+	}
 }
 
 include("head.inc");
diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php
index 465baa9..62765d3 100755
--- a/usr/local/www/diag_logs_slbd.php
+++ b/usr/local/www/diag_logs_slbd.php
@@ -39,9 +39,14 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("killall syslogd");
-	exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}");
-	system_syslogd_start();
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink($slbd_logfile);
+		touch($slbd_logfile);
+	} else {
+		exec("killall syslogd");
+		exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}");
+		system_syslogd_start();
+	}
 }
 
 $pgtitle = array("Status","System logs","Load Balancer");
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index a6685d3..4f2f9b9 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -37,7 +37,12 @@ if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("/usr/sbin/clog -i -s 65536 /var/log/vpn.log");
+	if(isset($config['system']['disablesyslogclog'])) {
+		unlink("/var/log/vpn.log");
+		touch("/var/log/vpn.log");
+	} else {	
+		exec("/usr/sbin/clog -i -s 65536 /var/log/vpn.log");
+	}
 	/* redirect to avoid reposting form data on refresh */
 	header("Location: diag_logs_vpn.php");
 	exit;