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/www/guiconfig.inc | |
| 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/www/guiconfig.inc')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 10 |
1 files changed, 2 insertions, 8 deletions
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); } |
