Nuke fifolog support. It was never used or fully implemented, no GUI option, and didn't end up working out.

It buffered writes too long, users could never see the most current log data.

4 files changed, 25 insertions, 105 deletions

diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index 1521ef5..b251d20 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -555,43 +555,6 @@ function update_changedesc($update) {
 	$changecount++;
 }
 
-function clear_log_file($logfile = "/var/log/system.log", $restart_syslogd = true) {
-	global $config, $g;
-	if ($restart_syslogd) {
-		exec("/usr/bin/killall syslogd");
-	}
-	if (isset($config['system']['disablesyslogclog'])) {
-		unlink($logfile);
-		touch($logfile);
-	} else {
-		$log_size = isset($config['syslog']['logfilesize']) ? $config['syslog']['logfilesize'] : "511488";
-		$log_size = isset($config['syslog'][basename($logfile, '.log') . '_settings']['logfilesize']) ? $config['syslog'][basename($logfile, '.log') . '_settings']['logfilesize'] : $log_size;
-		if (isset($config['system']['usefifolog'])) {
-			exec("/usr/sbin/fifolog_create -s {$log_size} " . escapeshellarg($logfile));
-		} else {
-			exec("/usr/local/sbin/clog -i -s {$log_size} " . escapeshellarg($logfile));
-		}
-	}
-	if ($restart_syslogd) {
-		system_syslogd_start();
-	}
-}
-
-function clear_all_log_files() {
-	global $g;
-	exec("/usr/bin/killall syslogd");
-
-	$log_files = array("system", "filter", "dhcpd", "vpn", "pptps", "poes", "l2tps", "openvpn", "portalauth", "ipsec", "ppp", "relayd", "wireless", "lighttpd", "ntpd", "gateways", "resolver", "routing");
-	foreach ($log_files as $lfile) {
-		clear_log_file("{$g['varlog_path']}/{$lfile}.log", false);
-	}
-
-	system_syslogd_start();
-	killbyname("dhcpd");
-	services_dhcpd_configure();
-	return;
-}
-
 // This version of dump_clog() does not output <td></td> or any other table elements.
 function dump_clog_no_table($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "") {
 	global $g, $config;
@@ -615,11 +578,7 @@ function dump_clog_no_table($logfile, $tail, $withorig = true, $grepfor = "", $g
 		if ($config['system']['disablesyslogclog']) {
 			exec("cat " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
 		} else {
-			if (isset($config['system']['usefifolog'])) {
-				exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
-			} else {
-				exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
-			}
+			exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
 		}
 	}
 	echo "\n";
@@ -630,14 +589,9 @@ function dump_clog_no_table($logfile, $tail, $withorig = true, $grepfor = "", $g
 		$logent = preg_split("/\s+/", $logent, 6);
 
 		if ($withorig) {
-				if (isset($config['system']['usefifolog'])) {
-					$entry_date_time = htmlspecialchars(date("F j, Y, g:i a", "" . $logent[1] . ""));
-					$entry_text = htmlspecialchars($logent[5]);
-				} else {
-					$entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3)));
-					$entry_text = ($logent[3] ==  $config['system']['hostname']) ? "" : $logent[3] . " ";
-					$entry_text .= htmlspecialchars($logent[4] . " " . $logent[5]);
-				}
+				$entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3)));
+				$entry_text = ($logent[3] ==  $config['system']['hostname']) ? "" : $logent[3] . " ";
+				$entry_text .= htmlspecialchars($logent[4] . " " . $logent[5]);
 				echo "{$entry_date_time}";
 				echo " " . "{$entry_text}"	. "\n";
 		} else {
@@ -670,11 +624,7 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
 		if ($config['system']['disablesyslogclog']) {
 			exec("cat " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
 		} else {
-			if (isset($config['system']['usefifolog'])) {
-				exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
-			} else {
-				exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
-			}
+			exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
 		}
 	}
 
@@ -684,14 +634,9 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
 		$logent = preg_split("/\s+/", $logent, 6);
 		echo "<tr>\n";
 		if ($withorig) {
-			if (isset($config['system']['usefifolog'])) {
-				$entry_date_time = htmlspecialchars(date("F j, Y, g:i a", "" . $logent[1] . ""));
-				$entry_text = htmlspecialchars($logent[5]);
-			} else {
-				$entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3)));
-				$entry_text = ($logent[3] == $config['system']['hostname']) ? "" : $logent[3] . " ";
-				$entry_text .= htmlspecialchars($logent[4] . " " . $logent[5]);
-			}
+			$entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3)));
+			$entry_text = ($logent[3] == $config['system']['hostname']) ? "" : $logent[3] . " ";
+			$entry_text .= htmlspecialchars($logent[4] . " " . $logent[5]);
 			echo "<td style=\"white-space:nowrap;\">{$entry_date_time}</td>\n";
 			echo "<td style=\"word-wrap:break-word; word-break:break-all; white-space:normal\">{$entry_text}</td>\n";
 		} else {
@@ -719,11 +664,7 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve
 	if ($config['system']['disablesyslogclog']) {
 		exec("cat " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
 	} else {
-		if (isset($config['system']['usefifolog'])) {
-			exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
-		} else {
-			exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
-		}
+		exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
 	}
 	return($logarr);
 }
diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php
index 7c3bbe7..06fa756 100755
--- a/src/usr/local/www/status.php
+++ b/src/usr/local/www/status.php
@@ -254,37 +254,20 @@ if (file_exists("/boot/loader.conf.local")) {
 if (file_exists("/var/etc/filterdns.conf")) {
 	defCmdT("Filter DNS Daemon Config", "/bin/cat /var/etc/filterdns.conf");
 }
-if (isset($config['system']['usefifolog']))  {
-	defCmdT("last 1000 system log entries", "/usr/sbin/fifolog_reader /var/log/system.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 DHCP log entries", "/usr/sbin/fifolog_reader /var/log/dhcpd.log 2>&1 | tail -n 1000");
-	defCmdT("last 500 filter log entries", "/usr/sbin/fifolog_reader /var/log/filter.log 2>&1 | tail -n 500");
-	defCmdT("last 1000 gateways log entries", "/usr/sbin/fifolog_reader /var/log/gateways.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 IPsec log entries", "/usr/sbin/fifolog_reader /var/log/ipsec.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 L2TP log entries", "/usr/sbin/fifolog_reader /var/log/l2tps.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 NTP log entries", "/usr/sbin/fifolog_reader /var/log/ntpd.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 OpenVPN log entries", "/usr/sbin/fifolog_reader /var/log/openvpn.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 Captive Portal auth log entries", "/usr/sbin/fifolog_reader /var/log/portalauth.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 PPP log entries", "/usr/sbin/fifolog_reader /var/log/poes.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 relayd log entries", "/usr/sbin/fifolog_reader /var/log/relayd.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 resolver log entries", "/usr/sbin/fifolog_reader /var/log/resolver.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 routing log entries", "/usr/sbin/fifolog_reader /var/log/routing.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 wireless log entries", "/usr/sbin/fifolog_reader /var/log/wireless.log 2>&1 | tail -n 1000");
-} else {
-	defCmdT("last 1000 system log entries", "/usr/local/sbin/clog /var/log/system.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 DHCP log entries", "/usr/local/sbin/clog /var/log/dhcpd.log 2>&1 | tail -n 1000");
-	defCmdT("last 500 filter log entries", "/usr/local/sbin/clog /var/log/filter.log 2>&1 | tail -n 500");
-	defCmdT("last 1000 gateways log entries", "/usr/local/sbin/clog /var/log/gateways.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 IPsec log entries", "/usr/local/sbin/clog /var/log/ipsec.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 L2TP log entries", "/usr/local/sbin/clog /var/log/l2tps.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 NTP log entries", "/usr/local/sbin/clog /var/log/ntpd.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 OpenVPN log entries", "/usr/local/sbin/clog /var/log/openvpn.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 Captive Portal auth log entries", "/usr/local/sbin/clog /var/log/portalauth.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 PPP log entries", "/usr/local/sbin/clog /var/log/poes.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 relayd log entries", "/usr/local/sbin/clog /var/log/relayd.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 resolver log entries", "/usr/local/sbin/clog /var/log/resolver.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 routing log entries", "/usr/local/sbin/clog /var/log/routing.log 2>&1 | tail -n 1000");
-	defCmdT("last 1000 wireless log entries", "/usr/local/sbin/clog /var/log/wireless.log 2>&1 | tail -n 1000");
-}
+defCmdT("last 1000 system log entries", "/usr/local/sbin/clog /var/log/system.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 DHCP log entries", "/usr/local/sbin/clog /var/log/dhcpd.log 2>&1 | tail -n 1000");
+defCmdT("last 500 filter log entries", "/usr/local/sbin/clog /var/log/filter.log 2>&1 | tail -n 500");
+defCmdT("last 1000 gateways log entries", "/usr/local/sbin/clog /var/log/gateways.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 IPsec log entries", "/usr/local/sbin/clog /var/log/ipsec.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 L2TP log entries", "/usr/local/sbin/clog /var/log/l2tps.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 NTP log entries", "/usr/local/sbin/clog /var/log/ntpd.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 OpenVPN log entries", "/usr/local/sbin/clog /var/log/openvpn.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 Captive Portal auth log entries", "/usr/local/sbin/clog /var/log/portalauth.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 PPP log entries", "/usr/local/sbin/clog /var/log/poes.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 relayd log entries", "/usr/local/sbin/clog /var/log/relayd.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 resolver log entries", "/usr/local/sbin/clog /var/log/resolver.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 routing log entries", "/usr/local/sbin/clog /var/log/routing.log 2>&1 | tail -n 1000");
+defCmdT("last 1000 wireless log entries", "/usr/local/sbin/clog /var/log/wireless.log 2>&1 | tail -n 1000");
 if (file_exists("/tmp/PHP_errors.log")) {
 	defCmdT("PHP Error Log", "/bin/cat /tmp/PHP_errors.log");
 }
diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php
index 9c0b310..8fa193a 100644
--- a/src/usr/local/www/status_logs_settings.php
+++ b/src/usr/local/www/status_logs_settings.php
@@ -107,7 +107,7 @@ function is_valid_syslog_server($target) {
 }
 
 if ($_POST['resetlogs'] == gettext("Reset Log Files")) {
-	clear_all_log_files();
+	clear_all_log_files(true);
 	$savemsg .= gettext("The log files have been reset.");
 } elseif ($_POST) {
 	unset($input_errors);
diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index cdf2061..a1335e7 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -114,11 +114,7 @@ function dump_clog_vpn($logfile, $tail) {
 
 	$logarr = "";
 
-	if (isset($config['system']['usefifolog'])) {
-		exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
-	} else {
-		exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
-	}
+	exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
 
 	$rows = 0;
 	foreach ($logarr as $logent) {