Do not restart syslkog, just hup it

11 files changed, 57 insertions, 64 deletions

diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php
index 47481b0..f3a1839 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -53,14 +53,15 @@ if ($_POST['clear']) {
 		touch($syslog_logfile);
 		system_syslogd_start();
 	} else {  
-		exec("killall syslogd");
-		sleep(1);
-		if(file_exists("{$system_logfile}")) 
-			unlink("{$system_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);
+//		if(file_exists("{$system_logfile}")) 
+//			unlink("{$system_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$system_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
+//		system_syslogd_start();
+//		Header("Location: diag_logs.php");
 	}
-
 }
 
 if ($_GET['filtertext'])
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index a494411..2c0c7ef 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -49,12 +49,12 @@ if ($_POST['clear']) {
 		unlink($portal_logfile);
 		touch($portal_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$portal_logfile}")) 
-			unlink("{$portal_logfile}");		
+//		exec("killall syslogd");
+///		sleep(1);		
+//		if(file_exists("{$portal_logfile}")) 
+//			unlink("{$portal_logfile}");		
 		exec("/usr/sbin/fifolog_create -s 511488 {$portal_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$portal_logfile}");
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index 7e9003e..cdca3a2 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -51,12 +51,12 @@ if ($_POST['clear']) {
 		unlink($dhcpd_logfile);
 		touch($dhcpd_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$dhcpd_logfile}")) 
-			unlink("{$dhcpd_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$dhcpd_logfile}")) 
+//			unlink("{$dhcpd_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$dhcpd_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$dhcpd_logfile}");
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index c6c007c..b79106f 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -60,13 +60,12 @@ if ($_POST['clear']) {
 		unlink("/var/log/filter.log");
 		touch("/var/log/filter.log");
 	} else {	
-		exec("killall syslogd");
-		sleep(1);
-		if(file_exists("{$filter_logfile}"))
-			unlink("{$filter_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);
+//		if(file_exists("{$filter_logfile}"))
+//			unlink("{$filter_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$filter_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$filter_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php
index 58d239c..bf68e43 100755
--- a/usr/local/www/diag_logs_filter_dynamic.php
+++ b/usr/local/www/diag_logs_filter_dynamic.php
@@ -52,13 +52,12 @@ if ($_POST['clear']) {
 		unlink("/var/log/filter.log");
 		touch("/var/log/filter.log");
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$filter_logfile}")
-			unlink("{$filter_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$filter_logfile}")
+//			unlink("{$filter_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$filter_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$filter_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index bea3f00..d83d895 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -67,13 +67,12 @@ if ($_POST['clear']) {
 		unlink($ipsec_logfile);
 		touch($ipsec_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$ipsec_logfile}"))
-			unlink("{$ipsec_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$ipsec_logfile}"))
+//			unlink("{$ipsec_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$ipsec_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$ipsec_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php
index 8f2efa4..57a9aae 100644
--- a/usr/local/www/diag_logs_ntpd.php
+++ b/usr/local/www/diag_logs_ntpd.php
@@ -49,13 +49,12 @@ if ($_POST['clear']) {
 		unlink($ntpd_logfile);
 		touch($ntpd_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$ntpd_logfile}"))
-			unlink("{$ntpd_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$ntpd_logfile}"))
+//			unlink("{$ntpd_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$ntpd_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$ntpd_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php
index f157266..fe1bafe 100644
--- a/usr/local/www/diag_logs_openvpn.php
+++ b/usr/local/www/diag_logs_openvpn.php
@@ -54,13 +54,12 @@ if ($_POST['clear']) {
 		unlink($openvpn_logfile);
 		touch($openvpn_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$openvpn_logfile}"))
-			unlink("{$openvpn_logfile}");		
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$openvpn_logfile}"))
+//			unlink("{$openvpn_logfile}");		
 		exec("/usr/sbin/fifolog_create -s 262144 {$openvpn_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$openvpn_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php
index 6bb746f..ef138e7 100755
--- a/usr/local/www/diag_logs_relayd.php
+++ b/usr/local/www/diag_logs_relayd.php
@@ -50,13 +50,12 @@ if ($_POST['clear']) {
 		unlink($relayd_logfile);
 		touch($relayd_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$relayd_logfile}"))
-			unlink("{$relayd_logfile}");
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$relayd_logfile}"))
+//			unlink("{$relayd_logfile}");
 		exec("/usr/sbin/fifolog_create -s 511488 {$relayd_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$relayd_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php
index 8cbd915..ae1a182 100755
--- a/usr/local/www/diag_logs_slbd.php
+++ b/usr/local/www/diag_logs_slbd.php
@@ -50,13 +50,12 @@ if ($_POST['clear']) {
 		unlink($slbd_logfile);
 		touch($slbd_logfile);
 	} else {
-		exec("killall syslogd");
-		sleep(1);		
-		if(file_exists("{$slbd_logfile}"))	
-			unlink("{$slbd_logfile}");		
+//		exec("killall syslogd");
+//		sleep(1);		
+//		if(file_exists("{$slbd_logfile}"))	
+//			unlink("{$slbd_logfile}");		
 		exec("/usr/sbin/fifolog_create -s 511488 {$slbd_logfile}");
-		exec("/bin/date | /usr/sbin/fifolog_writer {$slbd_logfile}");
-		system_syslogd_start();
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 }
 
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 156267d..939884b 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -49,13 +49,12 @@ if ($_POST['clear']) {
 		unlink("/var/log/vpn.log");
 		touch("/var/log/vpn.log");
 	} else {
-		exec("killall syslogd");
-		sleep(1);
-		if(file_exists("/var/log/vpn.log"))	
-			unlink("/var/log/vpn.log");
+//		exec("killall syslogd");
+//		sleep(1);
+//		if(file_exists("/var/log/vpn.log"))	
+//			unlink("/var/log/vpn.log");
 		exec("/usr/sbin/fifolog_create -s 50688 /var/log/vpn.log");
-		exec("/bin/date | /usr/sbin/fifolog_writer /var/log/vpn.log");
-		system_syslogd_start();		
+		exec("/usr/bin/killall -HUP syslogd");
 	}
 	/* redirect to avoid reposting form data on refresh */
 	header("Location: diag_logs_vpn.php");