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

Move clog from /usr to /usr/local

Browse Source 
Conflicts:
	etc/inc/filter_log.inc
	etc/inc/system.inc
	etc/rc
	usr/local/www/guiconfig.inc
This commit is contained in:
Renato Botelho 2014-04-28 11:54:22 -03:00
parent dc5c69f122
commit 2db29614d2
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/filter_log.inc
View File

@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
/*
pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/sbin/clog
pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/local/sbin/clog
pfSense_MODULE: filter
*/
@ -57,7 +57,7 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | /usr/bin/tail -r -n {$tail}", $logarr);
else
exec("/usr/sbin/clog " . escapeshellarg($logfile) . " | grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -r -n {$tail}", $logarr);
exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -r -n {$tail}", $logarr);
$filterlog = array();
$counter = 0;

2
etc/inc/system.inc
View File

@ -578,7 +578,7 @@ function system_syslogd_start() {
} else { // Defaults to CLOG
$log_directive = "%";
$log_size = "10240";
$log_create_directive = "/usr/sbin/clog -i -s ";
$log_create_directive = "/usr/local/sbin/clog -i -s ";
}
if (isset($syslogcfg)) {

2
etc/rc
View File

@ -287,7 +287,7 @@ for logfile in $LOG_FILES; do
# generate fifolog files
/usr/sbin/fifolog_create -s 511488 /var/log/$logfile.log
else
/usr/sbin/clog -i -s 512144 /var/log/$logfile.log
/usr/local/sbin/clog -i -s 512144 /var/log/$logfile.log
fi
fi
fi

4
usr/local/www/diag_logs_vpn.php
View File

@ -30,7 +30,7 @@
*/
/*
pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/sbin/clog
pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/local/sbin/clog
pfSense_MODULE: vpn
*/
@ -92,7 +92,7 @@ function dump_clog_vpn($logfile, $tail) {
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
else
exec("/usr/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | tail {$sor} -n " . $tail, $logarr);
foreach ($logarr as $logent) {
$logent = preg_split("/\s+/", $logent, 6);

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

@ -581,7 +581,7 @@ function clear_log_file($logfile = "/var/log/system.log") {
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_create -s 511488 " . escapeshellarg($logfile));
else
exec("/usr/sbin/clog -i -s 511488 " . escapeshellarg($logfile));
exec("/usr/local/sbin/clog -i -s 511488 " . escapeshellarg($logfile));
}
system_syslogd_start();
}
@ -604,7 +604,7 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
if(isset($config['system']['usefifolog']))
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
else
exec("/usr/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
}
}
foreach ($logarr as $logent) {
@ -644,7 +644,7 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve
if(isset($config['system']['usefifolog'])) {
exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
} else {
exec("/usr/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . "{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
}
}
return($logarr);

4
usr/local/www/status.php
View File

@ -186,8 +186,8 @@ if(isset($config['system']['usefifolog'])) {
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");
} else {
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/local/sbin/clog /var/log/system.log 2>&1 | tail -n 200");
defCmdT("last 50 filter log entries","/usr/local/sbin/clog /var/log/filter.log 2>&1 | tail -n 50");
}
defCmd("ls /conf");