7 files changed, 146 insertions, 1 deletions
diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index 4fe4d294..0f993006 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -64,6 +64,11 @@
 	    <chmod>0755</chmod>
 	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_view_config.php</item>
 	</additional_files_needed>
+   	<additional_files_needed>
+	    <prefix>/usr/local/www/</prefix>
+	    <chmod>0755</chmod>
+	    <item>http://www.pfsense.com/packages/config/varnish64/varnishstat.php</item>
+	</additional_files_needed>
 	<menu>
 		<name>Varnish</name>
 		<tooltiptext>Varnish</tooltiptext>
@@ -96,6 +101,10 @@
 			<text>View Configuration</text>
 			<url>/varnish_view_config.php</url>
 		</tab>
+		<tab>
+			<text>VarnishSTAT</text>
+			<url>/varnishstat.php</url>
+		</tab>
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
diff --git a/config/varnish64/varnish_custom_vcl.xml b/config/varnish64/varnish_custom_vcl.xml
index fcfb3736..24635627 100644
--- a/config/varnish64/varnish_custom_vcl.xml
+++ b/config/varnish64/varnish_custom_vcl.xml
@@ -71,6 +71,10 @@
 			<text>View Configuration</text>
 			<url>/varnish_view_config.php</url>
 		</tab>
+		<tab>
+			<text>VarnishSTAT</text>
+			<url>/varnishstat.php</url>
+		</tab>
 	</tabs>
 	<fields>
 		<field>
diff --git a/config/varnish64/varnish_lb_directors.xml b/config/varnish64/varnish_lb_directors.xml
index 400f66b8..1ace8933 100644
--- a/config/varnish64/varnish_lb_directors.xml
+++ b/config/varnish64/varnish_lb_directors.xml
@@ -91,6 +91,10 @@
 			<text>View Configuration</text>
 			<url>/varnish_view_config.php</url>
 		</tab>
+		<tab>
+			<text>VarnishSTAT</text>
+			<url>/varnishstat.php</url>
+		</tab>
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
diff --git a/config/varnish64/varnish_settings.xml b/config/varnish64/varnish_settings.xml
index 55d236e1..58860688 100644
--- a/config/varnish64/varnish_settings.xml
+++ b/config/varnish64/varnish_settings.xml
@@ -71,6 +71,10 @@
 			<text>View Configuration</text>
 			<url>/varnish_view_config.php</url>
 		</tab>
+		<tab>
+			<text>VarnishSTAT</text>
+			<url>/varnishstat.php</url>
+		</tab>
 	</tabs>
 	<fields>
 		<field>
diff --git a/config/varnish64/varnish_sync.xml b/config/varnish64/varnish_sync.xml
index 4b8ff355..b2408df9 100644
--- a/config/varnish64/varnish_sync.xml
+++ b/config/varnish64/varnish_sync.xml
@@ -68,6 +68,10 @@
 			<active/>
 		</tab>
 		<tab>
+			<text>VarnishSTAT</text>
+			<url>/varnishstat.php</url>
+		</tab>
+		<tab>
 			<text>View Configuration</text>
 			<url>/varnish_view_config.php</url>
 		</tab>
diff --git a/config/varnish64/varnish_view_config.php b/config/varnish64/varnish_view_config.php
index 6c3bfcf0..6566525e 100644
--- a/config/varnish64/varnish_view_config.php
+++ b/config/varnish64/varnish_view_config.php
@@ -57,7 +57,8 @@ include("head.inc");
 	$tab_array[] = array(gettext("Custom VCL"), false, "/pkg_edit.php?xml=varnish_custom_vcl.xml&id=0");
 	$tab_array[] = array(gettext("LB Directors"), false, "/pkg.php?xml=varnish_lb_directors.xml");
 	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=varnish_sync.xml&id=0");
-	$tab_array[] = array(gettext("View Configuration"), true, "/varnish_view-config.php");		
+	$tab_array[] = array(gettext("View Configuration"), true, "/varnish_view-config.php");
+	$tab_array[] = array(gettext("VarnishSTAT"), false, "/varnishstat.php");
 	display_top_tabs($tab_array);
 ?>
 </table>
diff --git a/config/varnish64/varnishstat.php b/config/varnish64/varnishstat.php
new file mode 100644
index 00000000..a4b42a37
--- /dev/null
+++ b/config/varnish64/varnishstat.php
@@ -0,0 +1,119 @@
+<?php
+/* $Id$ */
+/*
+	varnishstat_view_logs.php
+	part of pfSense (http://www.pfsense.com/)
+
+	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
+	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");
+
+if($_REQUEST['getactivity']) {
+	$varnishstatlogs = `varnishstat -1`;
+	echo "VarnishSTAT Server logs as of " . date("D M j G:i:s T Y")  . "\n\n";
+	echo $varnishstatlogs;
+	exit;
+}
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+	$one_two = true;
+
+$pgtitle = "VarnishSTAT: View Logs";
+include("head.inc");
+
+/* NEED TO FIX there are 2 logs /etc/varnishstat/log/main/current and /etc/dnscache/log/main/current */
+
+/* NEED TO FIX */
+if ($_POST['clear']) {
+//	exec("rm /etc/varnishstat/log/main/current");
+//	exec("touch /etc/varnishstat/log/main/current");
+}
+
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
+	<script type="text/javascript">
+		function getlogactivity() {
+			var url = "/varnishstat.php";
+			var pars = 'getactivity=yes';
+			var myAjax = new Ajax.Request(
+				url,
+				{
+					method: 'post',
+					parameters: pars,
+					onComplete: activitycallback
+				});
+		}
+		function activitycallback(transport) {
+			$('varnishstatlogs').innerHTML = '<font face="Courier"><pre>' + transport.responseText  + '</pre></font>';
+			setTimeout('getlogactivity()', 2500);		
+		}
+		setTimeout('getlogactivity()', 1000);	
+	</script>
+<?php include("fbegin.inc"); ?>
+
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
+
+<?php if ($savemsg) print_info_box($savemsg); ?>
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<?php
+	$tab_array = array();
+	$tab_array[] = array(gettext("Backends"), false, "/pkg.php?xml=varnish_backends.xml");
+	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=varnish_settings.xml&id=0");
+	$tab_array[] = array(gettext("Custom VCL"), false, "/pkg_edit.php?xml=varnish_custom_vcl.xml&id=0");
+	$tab_array[] = array(gettext("LB Directors"), false, "/pkg.php?xml=varnish_lb_directors.xml");
+	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=varnish_sync.xml&id=0");
+	$tab_array[] = array(gettext("View Configuration"), false, "/varnish_view-config.php");
+	$tab_array[] = array(gettext("VarnishSTAT"), true, "/varnishstat.php");
+	display_top_tabs($tab_array);
+?>
+</table>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+   <tr>
+     <td class="tabcont" >
+      <form action="varnishstat_view_logs.php" method="post">
+		<br>
+			<div id="varnishstatlogs">
+				<pre>One moment please, loading VarnishSTAT logs...</pre>
+			</div>
+     </td>
+    </tr>
+</table>
+<td align="left" valign="top">
+	<form id="filterform" name="filterform" action="varnishstat_view_logs.php" method="post" style="margin-top: 14px;">
+	<p/>
+	<input id="submit" name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log");?>" />
+	</form>
+</td>
+</div>
+<?php include("fend.inc"); ?>
+</body>
+</html>