diff options
author | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-31 22:28:54 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-31 22:28:54 -0400 |
commit | 568f30c2f897bffd08df28abb74b74cc2d8be2ad (patch) | |
tree | 03e29b24c6e73cf37cbfe979538f79a1b491625e /usr/local/www/diag_logs_vpn.php | |
parent | b24358d1aceeca7846f8cb370ef22b9d11156011 (diff) | |
download | pfsense-568f30c2f897bffd08df28abb74b74cc2d8be2ad.zip pfsense-568f30c2f897bffd08df28abb74b74cc2d8be2ad.tar.gz |
Switch back to clog but leave option to run fifolog.
Diffstat (limited to 'usr/local/www/diag_logs_vpn.php')
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 939884b..ba21924 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -45,16 +45,15 @@ if (!$nentries) $nentries = 50; if ($_POST['clear']) { + exec("/usr/bin/killall syslogd"); if(isset($config['system']['disablesyslogclog'])) { 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("/usr/sbin/fifolog_create -s 50688 /var/log/vpn.log"); - exec("/usr/bin/killall -HUP syslogd"); + if(isset($config['system']['usefifolog'])) + exec("/usr/sbin/fifolog_create -s 50688 /var/log/vpn.log"); + else + exec("/usr/sbin/clog -i -s 262144 /var/log/vpn.log"); } /* redirect to avoid reposting form data on refresh */ header("Location: diag_logs_vpn.php"); @@ -67,7 +66,11 @@ function dump_clog_vpn($logfile, $tail) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; $logarr = ""; - exec("/usr/sbin/fifolog_reader " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + + if(isset($config['system']['usefifolog'])) + exec("/usr/sbin/fifolog_reader " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + else + exec("/usr/sbin/clog " . $logfile . " | grep -v \"CLOG\" | grep -v \"\033\" | tail {$sor} -n " . $tail, $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); |