summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xusr/local/www/guiconfig.inc11
1 files changed, 8 insertions, 3 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 8670874..2208f02 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -639,7 +639,10 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
if(is_array($grepinvert))
foreach($grepinvert as $agrep)
$grepline .= " | grep -v \"$agrep\"";
- exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr);
+ 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} -->";
*/
@@ -672,7 +675,10 @@ function return_clog($logfile, $tail, $grepfor = "", $grepinvert = "", $grepreve
/* 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/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr);
+ 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);
return($logarr);
}
@@ -823,5 +829,4 @@ function display_widget_tabs(& $tab_array) {
echo "</div>";
}
-
?> \ No newline at end of file
OpenPOWER on IntegriCloud