From d7d3c307cb263ad79158cba43c1e0e429b54217c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 27 Apr 2010 13:38:16 -0400
Subject: Add backend probe settings

---
 config/varnish64/varnish.inc          | 29 +++++++++++++++++++++++++++++
 config/varnish64/varnish_backends.xml | 30 ++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc
index 1ec000e7..d21245d8 100644
--- a/config/varnish64/varnish.inc
+++ b/config/varnish64/varnish.inc
@@ -152,12 +152,41 @@ EOAU;
 				$first_byte_timeout = $backend['first_byte_timeout'] . "s";
 			else 
 				$first_byte_timeout = "300s";
+
+			if($backend['probe_url'])
+				$probe_url = $backend['probe_url'];
+			else 
+				$probe_url = "/";
+			if($backend['probe_interval'])
+				$probe_interval = $backend['probe_interval'] . "s";
+			else 
+				$probe_interval = "1s";
+			if($backend['probe_timeout'])
+				$probe_timeout = $backend['probe_timeout'] . "s";
+			else 
+				$probe_timeout = "1s";
+			if($backend['probe_window'])
+				$probe_window = $backend['probe_window'];
+			else 
+				$probe_window = "5";
+			if($backend['probe_threshold'])
+				$probe_threshold = $backend['probe_threshold'];
+			else 
+				$probe_threshold = "5";
+
 			$backends .= <<<EOFA
 backend {$backend['backendname']} {
 	.host = "{$backend['ipaddress']}";
 	.port = "{$backend['port']}";
 	.first_byte_timeout = {$first_byte_timeout};
 	.connect_timeout = {$connect_timeout};
+	.probe = {
+		.url = "{$backend['probe_url']}";
+		.interval = {$backend['probe_interval']};
+		.timeout = {$backend['probe_timeout']};
+		.window = {$backend['probe_window']};
+		.threshold = {$backend['probe_threshold']};
+	}
 }
 
 EOFA;
diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index 45a955d9..6a46287b 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -129,6 +129,36 @@
 			<description>The time to wait for a backend connection.</description>
 			<type>input</type>
 		</field>
+		<field>
+			<fielddescr>Probe URL</fielddescr>
+			<fieldname>probe_url</fieldname>
+			<description>Enter the URL that varnish will use to ensure that this backend is healthy.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Probe Interval</fielddescr>
+			<fieldname>probe_interval</fieldname>
+			<description>Enter the frequency in seconds that varnish will check the probe url.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Probe Timeout</fielddescr>
+			<fieldname>probe_timeout</fieldname>
+			<description>Enter the frequency in seconds that varnish will wait for a backend probe response.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Probe Window</fielddescr>
+			<fieldname>probe_window</fieldname>
+			<description>Enter the value of how many of the latest polls that should be examined.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Probe Threshold</fielddescr>
+			<fieldname>probe_threshold</fieldname>
+			<description>Enter the value of how many of those must have succeeded for us to consider the backend healthy.</description>
+			<type>input</type>
+		</field>
 		<field>
 			<fielddescr>none</fielddescr>
 			<fieldname>none</fieldname>
-- 
cgit v1.2.3