fix some of the logging for load balancer, still partially broken

This commit is contained in:
Chris Buechler 2010-07-11 19:57:36 -04:00
parent 32c580703f
commit 087a89f823
3 changed files with 7 additions and 5 deletions

View File

@ -483,6 +483,8 @@ function system_syslogd_start() {
if($syslogcfg['remoteserver3'])
$syslogconf .= "*.* @{$syslogcfg['remoteserver3']}\n";
}
$syslogconf .= "!relayd\n";
$syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/relayd.log\n";
$syslogconf .= "!-{$facilitylist}\n";
if (!isset($syslogcfg['disablelocallogging']))
$syslogconf .= <<<EOD
@ -495,7 +497,6 @@ news.err;local0.none;local3.none;local4.none; {$log_directive}{$g['varlog_path
local7.none {$log_directive}{$g['varlog_path']}/system.log
security.* {$log_directive}{$g['varlog_path']}/system.log
auth.info;authpriv.info;daemon.info {$log_directive}{$g['varlog_path']}/system.log
local1.* {$log_directive}{$g['varlog_path']}/relayd.log
auth.info;authpriv.info |exec /usr/local/sbin/sshlockout_pf
*.emerg *
@ -1450,4 +1451,4 @@ function system_get_dmesg_boot() {
return file_get_contents("{$g['varlog_path']}/dmesg.boot");
}
?>
?>

View File

@ -201,6 +201,7 @@ function relayd_configure() {
/* reindex pools by name as we loop through the pools array */
$pools = array();
$conf .= "log updates \n";
/* Virtual server pools */
if(is_array($pool_a)) {
for ($i = 0; isset($pool_a[$i]); $i++) {
@ -272,4 +273,4 @@ function relayd_configure() {
}
}
?>
?>

View File

@ -46,7 +46,7 @@ if (!is_array($config['load_balancer']['lbpool'])) {
}
$a_pool = &$config['load_balancer']['lbpool'];
$slbd_logfile = "{$g['varlog_path']}/slbd.log";
$lb_logfile = "{$g['varlog_path']}/relayd.log";
$nentries = $config['syslog']['nentries'];
if (!$nentries)
@ -117,7 +117,7 @@ include("head.inc");
$lastchange = "";
$svr = split("\|", $server);
$monitorip = $svr[1];
$logstates = return_clog($slbd_logfile, $nentries, true, array("$monitorip", "marking"), "", true);
$logstates = return_clog($lb_logfile, $nentries, true, array("$monitorip", "marking"), "", true);
$logstates = $logstates[0];