diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-03-15 19:00:47 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-03-15 19:01:07 -0400 |
commit | 57ecd9b6c79b8755654fd192e4e3cc6d1ec6ade3 (patch) | |
tree | 17b32aca06ffc1bcc11cc49cf1747babb6f8b8ba /usr/local | |
parent | 57dc2556889679a840ca50e9a08ced740428b934 (diff) | |
download | pfsense-57ecd9b6c79b8755654fd192e4e3cc6d1ec6ade3.zip pfsense-57ecd9b6c79b8755654fd192e4e3cc6d1ec6ade3.tar.gz |
Jettison clog and replace with fifolog which is included in FreeBSD 7.1
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/diag_logs.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_slbd.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_pkglogs.php | 2 | ||||
-rwxr-xr-x | usr/local/www/guiconfig.inc | 10 | ||||
-rwxr-xr-x | usr/local/www/status.php | 4 | ||||
-rw-r--r-- | usr/local/www/widgets/include/log.inc | 2 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/rss.widget.php | 6 |
15 files changed, 22 insertions, 28 deletions
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 42f4956..b97a3b0 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -55,7 +55,7 @@ if ($_POST['clear']) { system_syslogd_start(); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 {$system_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$system_logfile}"); system_syslogd_start(); } diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 4ac9f8f..3db4eeb 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -50,7 +50,7 @@ if ($_POST['clear']) { unlink($portal_logfile); touch($portal_logfile); } else { - exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$portal_logfile}"); } } diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index e537857..3573183 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -52,7 +52,7 @@ if ($_POST['clear']) { unlink($dhcpd_logfile); touch($dhcpd_logfile); } else { - exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$dhcpd_logfile}"); } } diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 54c4f07..daa9598 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -61,7 +61,7 @@ if ($_POST['clear']) { touch("/var/log/filter.log"); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 512144 /var/log/filter.log"); + exec("/usr/sbin/fifolog_create -s 512144 /var/log/filter.log"); system_syslogd_start(); } } @@ -78,7 +78,7 @@ function conv_clog($logfile, $tail = 50) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog {$logfile} | /usr/bin/tail {$sor} -n 500", $logarr); + exec("/usr/sbin/fifolog_reader {$logfile} | /usr/bin/tail {$sor} -n 500", $logarr); $filterlog = array(); diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 21511ec..ffc91d9 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -54,7 +54,7 @@ if ($_POST['clear']) { touch("/var/log/filter.log"); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 /var/log/filter.log"); + exec("/usr/sbin/fifolog_create -s 262144 /var/log/filter.log"); system_syslogd_start(); } } @@ -72,7 +72,7 @@ function conv_clog_filter($logfile, $tail = 50) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; $logarr = ""; - exec("/usr/sbin/clog {$logfile} | /usr/bin/tail {$sor} -n {$tail}", $logarr); + exec("/usr/sbin/fifolog_reader {$logfile} | /usr/bin/tail {$sor} -n {$tail}", $logarr); $filterlog = array(); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 15f8fcd..58a4372 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -69,7 +69,7 @@ if ($_POST['clear']) { touch($ipsec_logfile); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$ipsec_logfile}"); system_syslogd_start(); } } diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 0e8251c..10d7517 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -51,7 +51,7 @@ if ($_POST['clear']) { touch($ntpd_logfile); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 {$ntpd_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$ntpd_logfile}"); system_syslogd_start(); } } diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index 4f5be4b..f2b0c50 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -52,7 +52,7 @@ if ($_POST['clear']) { touch($relayd_logfile); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 {$relayd_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$relayd_logfile}"); system_syslogd_start(); } } diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index 066c6f8..7e6feba 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -52,7 +52,7 @@ if ($_POST['clear']) { touch($slbd_logfile); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$slbd_logfile}"); system_syslogd_start(); } } diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 14c9c12..fa545d3 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -49,7 +49,7 @@ if ($_POST['clear']) { unlink("/var/log/vpn.log"); touch("/var/log/vpn.log"); } else { - exec("/usr/sbin/clog -i -s 65536 /var/log/vpn.log"); + exec("/usr/sbin/fifolog_create -s 65536 /var/log/vpn.log"); } /* redirect to avoid reposting form data on refresh */ header("Location: diag_logs_vpn.php"); @@ -62,7 +62,7 @@ function dump_clog_vpn($logfile, $tail) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; $logarr = ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/fifolog_reader " . $logfile . " | tail {$sor} -n " . $tail, $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index 5720a75..91091ca 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -51,7 +51,7 @@ require("guiconfig.inc"); if(!($nentries = $config['syslog']['nentries'])) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 262144 {$logfile}"); + exec("/usr/sbin/fifolog_create -s 262144 {$logfile}"); } $i = 0; $pkgwithlogging = false; diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index ee2ffd7..68a645d 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -755,10 +755,7 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert if($config['system']['disablesyslogclog']) exec("cat {$logfile}{$grepline} | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr); else - exec("/usr/sbin/clog {$logfile}{$grepline} | grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr); - /* comment out debug code - echo "<!-- /usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail} -->"; - */ + exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); echo "<tr valign=\"top\">\n"; @@ -784,13 +781,10 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve if(is_array($grepinvert)) foreach($grepinvert as $agrep) $grepline .= " | grep -v \"$agrep\""; - /* comment out debug code - echo "<!-- /usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail} -->"; - */ if($config['system']['disablesyslogclog']) exec("cat {$logfile}{$grepline} | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr); else - exec("/usr/sbin/clog {$logfile}{$grepline} | grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr); + exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); return($logarr); } diff --git a/usr/local/www/status.php b/usr/local/www/status.php index 259b541..3b0e320 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -172,8 +172,8 @@ defCmdT("racoon.conf","cat /var/etc/racoon.conf"); defCmdT("SPD","/sbin/setkey -DP"); defCmdT("SAD","/sbin/setkey -D"); -defCmdT("last 200 system log entries","/usr/sbin/clog /var/log/system.log 2>&1 | tail -n 200"); -defCmdT("last 50 filter log entries","/usr/sbin/clog /var/log/filter.log 2>&1 | tail -n 50"); +defCmdT("last 200 system log entries","/usr/sbin/fifolog_reader /var/log/system.log 2>&1 | tail -n 200"); +defCmdT("last 50 filter log entries","/usr/sbin/fifolog_reader /var/log/filter.log 2>&1 | tail -n 50"); defCmd("ls /conf"); defCmd("ls /var/run"); diff --git a/usr/local/www/widgets/include/log.inc b/usr/local/www/widgets/include/log.inc index 7afaba8..08d4205 100644 --- a/usr/local/www/widgets/include/log.inc +++ b/usr/local/www/widgets/include/log.inc @@ -25,7 +25,7 @@ function conv_clog_filter($logfile, $tail = 8) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog {$logfile} | /usr/bin/tail {$sor} -n 500", $logarr); + exec("/usr/sbin/fifolog_reader {$logfile} | /usr/bin/tail {$sor} -n 500", $logarr); $filterlog = array(); diff --git a/usr/local/www/widgets/widgets/rss.widget.php b/usr/local/www/widgets/widgets/rss.widget.php index 8119565..4a592bc 100644 --- a/usr/local/www/widgets/widgets/rss.widget.php +++ b/usr/local/www/widgets/widgets/rss.widget.php @@ -112,7 +112,7 @@ else </tr> <tr> <td align="right"> - Show how many words from story: + Show how many characters from story: </td> <td> <select name='rsswidgettextlength' id='rsswidgettextlength'> @@ -154,8 +154,8 @@ else mkdir("/tmp/simplepie"); mkdir("/tmp/simplepie/cache"); } - exec("chmod a+rw/tmp/simplepie/."); - exec("chmod a+rw/tmp/simplepie/cache/."); + exec("chmod a+rw /tmp/simplepie/."); + exec("chmod a+rw /tmp/simplepie/cache/."); $counter = 1; foreach($feed->get_items() as $item) { $feed = $item->get_feed(); |