From 087a89f823d366d3588c5ce1ca351b6e2dcee2d3 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Sun, 11 Jul 2010 19:57:36 -0400
Subject: [PATCH] fix some of the logging for load balancer, still partially
 broken

---
 etc/inc/system.inc               | 5 +++--
 etc/inc/vslb.inc                 | 3 ++-
 usr/local/www/status_lb_pool.php | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index a79a5fbeab..618a50df64 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -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");
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc
index 4c90f2268b..bb92e191c5 100644
--- a/etc/inc/vslb.inc
+++ b/etc/inc/vslb.inc
@@ -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() {
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/status_lb_pool.php b/usr/local/www/status_lb_pool.php
index 8ac950fb6e..18b4c57c36 100755
--- a/usr/local/www/status_lb_pool.php
+++ b/usr/local/www/status_lb_pool.php
@@ -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];