mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fix status -> slbd

Browse Source 
* Simplify dump_clog() and return_clog() to where a preschooler can read
* Fix main diagnostics logs after the above fallout
This commit is contained in:
Scott Ullrich 2006-10-07 00:44:02 +00:00
parent 7fdcfdd3e3
commit fa626e70d0
2 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/www/diag_logs.php
View File

@ -79,7 +79,7 @@ include("head.inc");
<tr>
<td colspan="2" class="listtopic">Last <?=$nentries;?> system log entries</td>
</tr>
<?php dump_clog($system_logfile, $nentries, true, array("racoon","ntpd"), array("pppoe")); ?>
<?php dump_clog($system_logfile, $nentries, true, array(), array("racoon", "ntpd", "pppoe")); ?>
<tr>
<td>
<br>

56
usr/local/www/guiconfig.inc
View File

@ -563,18 +563,12 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
$sor = isset($config['syslog']['reverse']) ? "-r" : "";
$logarr = "";
$grepline = " ";
if(is_array($grepfor)) {
$i = 0;
foreach($grepfor as $agrep) {
$regexp = $agrep;
if($grepinvert[$i]) {
$grepline .= " | grep \"$regexp\"";
} else {
$grepline .= " | grep -v \"$regexp\"";
}
$i++;
}
}
if(is_array($grepfor))
foreach($grepfor as $agrep)
$grepline .= " | grep \"$agrep\"";
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);
echo "<!-- /usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail} -->";
foreach ($logarr as $logent) {
@ -597,37 +591,15 @@ function return_clog($logfile, $tail, $grepfor = "", $grepinvert = "", $grepreve
$sor = isset($grepreverse) ? "-r" : "";
$logarr = "";
$grepline = " ";
if(is_array($grepfor)) {
$i = 0;
foreach($grepfor as $agrep) {
$regexp = $agrep;
if($grepinvert[$i]) {
$grepline .= " | grep \"$regexp\"";
} else {
$grepline .= " | grep -v \"$regexp\"";
}
$i++;
}
}
if(is_array($grepfor))
foreach($grepfor as $agrep)
$grepline .= " | grep \"$agrep\"";
if(is_array($grepinvert))
foreach($grepinvert as $agrep)
$grepline .= " | grep -v \"$agrep\"";
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(is_array($grepfor)) {
$i = 0;
foreach($grepfor as $agrep) {
$regexp = "/" . $agrep . "/i";
if($grepinvert[$i]) {
$logarr = preg_grep($regexp, $logarr, PREG_GREP_INVERT);
} else {
$logarr = preg_grep($regexp, $logarr);
}
$i++;
}
}
$i = 0;
foreach ($logarr as $logent) {
$logarray[$i] = "$logent";
$i++;
}
return($logarray);
return($logarr);
}
/* Check if variable has changed, update and log if it has