Break out Load Balancer log files

8 files changed, 144 insertions, 49 deletions

diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php
index 4dabe48..db7f5f6 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -57,13 +57,14 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", true, "diag_logs.php");
-	$tab_array[1] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", false, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array("System", true, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
 		</td>
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index a7f71af..f7824c0 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -54,13 +54,14 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", false, "diag_logs.php");
-	$tab_array[1] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", true, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", false, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", true, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index 057aabf..7630c02 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -56,13 +56,14 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", false, "diag_logs.php");
-	$tab_array[1] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", true, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", false, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", true, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 1bb1e7c..f2ecd65 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -122,13 +122,14 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", false, "diag_logs.php");
-	$tab_array[1] = array("Firewall", true, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", false, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", true, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
  </td></tr>
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 511bfe2..1618438 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -56,13 +56,14 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", false, "diag_logs.php");
-	$tab_array[1] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", true, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", false, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", true, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   		</td>
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index 0bbd742..0b5caca 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -130,13 +130,14 @@ function enable_change(enable_over) {
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", false, "diag_logs.php");
-	$tab_array[1] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", false, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", true, "diag_logs_settings.php");
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", true, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php
new file mode 100755
index 0000000..97efb7a
--- /dev/null
+++ b/usr/local/www/diag_logs_slbd.php
@@ -0,0 +1,88 @@
+#!/usr/local/bin/php
+<?php
+/* $Id$ */
+/*
+	diag_logs_slbd.php
+	part of pfSense
+
+	Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
+	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+$slbd_logfile = "{$g['varlog_path']}/slbd.log";
+
+$nentries = $config['syslog']['nentries'];
+if (!$nentries)
+	$nentries = 50;
+
+if ($_POST['clear']) {
+	exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}");
+}
+
+$pgtitle = "Diagnostics: System logs: Load Balancer";
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td>
+<?php
+	$tab_array = array();
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", true, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	display_top_tabs($tab_array);
+?>
+  </td></tr>
+  <tr>
+    <td>
+	<div id="mainarea">
+		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+		  <tr>
+			<td colspan="2" class="listtopic">
+			  Last <?=$nentries;?> Load Balancer log entries</td>
+		  </tr>
+		  <?php dump_clog($slbd_logfile, $nentries); ?>
+		<tr><td><br><form action="diag_logs_slbd.php" method="post">
+<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr>
+		</table>
+	</div>
+</form>
+	</td>
+  </tr>
+</table>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index d7ffa02..c9ed3ea 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -56,13 +56,14 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("System", false, "diag_logs.php");
-	$tab_array[1] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[2] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[3] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[4] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
-	$tab_array[5] = array("PPTP VPN", true, "diag_logs_vpn.php");
-	$tab_array[6] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array("System", false, "diag_logs.php");
+	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
+	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
+	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
+	$tab_array[] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+	$tab_array[] = array("PPTP VPN", true, "diag_logs_vpn.php");
+	$tab_array[] = array("Load Balance", false, "diag_logs_slbd.php");
+	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>