diff options
| author | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-31 22:19:14 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-31 22:19:14 -0400 |
| commit | b24358d1aceeca7846f8cb370ef22b9d11156011 (patch) | |
| tree | 9140d015ab0c06f5f809e302e8f89b1f05be2e27 /usr/local/www | |
| parent | 7ee97cb377187ff8cd4ade9d32b5de6af983e973 (diff) | |
| download | pfsense-b24358d1aceeca7846f8cb370ef22b9d11156011.zip pfsense-b24358d1aceeca7846f8cb370ef22b9d11156011.tar.gz | |
Switch back to CLOG by default. Leave support for fifolog as a config.xml item.
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index a0e25d8..4310c2c 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -755,10 +755,14 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert if(file_exists($logfile) && filesize($logfile) == 0) { $logarr = array("Log file started."); } else { - if($config['system']['disablesyslogclog']) + if($config['system']['disablesyslogclog']) { exec("cat {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); - else - exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); + } else { + if(isset($config['system']['usefifolog'])) + exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /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); + } } foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -786,10 +790,15 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve if(is_array($grepinvert)) foreach($grepinvert as $agrep) $grepline .= " | grep -v \"$agrep\""; - if($config['system']['disablesyslogclog']) + if($config['system']['disablesyslogclog']) { exec("cat {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); - else - exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); + } else { + if(isset($config['system']['usefifolog'])) { + exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /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); + } + } return($logarr); } |
