From cb03cf432708da1e1f8edb0796ebd7fd87486c7c Mon Sep 17 00:00:00 2001
From: Torben Nielsen <torben@t-hoerup.dk>
Date: Sun, 3 Mar 2013 16:52:01 +0100
Subject: varnish3: Add gui option to disable backend probing

---
 config/varnish3/varnish.inc          | 24 +++++++++++++++++-------
 config/varnish3/varnish_backends.xml |  8 +++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'config')

diff --git a/config/varnish3/varnish.inc b/config/varnish3/varnish.inc
index 9d38161e..5ff2896f 100644
--- a/config/varnish3/varnish.inc
+++ b/config/varnish3/varnish.inc
@@ -329,6 +329,22 @@ function get_backend_config_txt() {
 				$probe_threshold = $backend['probe_threshold'];
 			else 
 				$probe_threshold = "5";
+
+
+			if ($backend['probe_disable']) {
+				$probe = "";
+			} else {
+				$probe = <<<EOFPROBE
+	.probe = {
+		 {$probe_url}
+		.interval = {$probe_interval};
+		.timeout = {$probe_timeout};
+		.window = {$probe_window};
+		.threshold = {$probe_threshold};
+	}
+EOFPROBE;
+			}
+
 			if (isset($probe_threshold)){
 				#last parameter set ,so write conf if backend is in use
 				if ($backends_in_use[$backend['backendname']] != ""){
@@ -340,13 +356,7 @@ backend {$backend['backendname']}BACKEND {
 	.port = "{$backend['port']}";
 	.first_byte_timeout = {$first_byte_timeout};
 	.connect_timeout = {$connect_timeout};
-	.probe = {
-		{$probe_url}
-		.interval = {$probe_interval};
-		.timeout = {$probe_timeout};
-		.window = {$probe_window};
-		.threshold = {$probe_threshold};
-	}
+{$probe}
 }
 
 
diff --git a/config/varnish3/varnish_backends.xml b/config/varnish3/varnish_backends.xml
index e35ef07b..e480a8d6 100644
--- a/config/varnish3/varnish_backends.xml
+++ b/config/varnish3/varnish_backends.xml
@@ -11,7 +11,7 @@
     Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
     Copyright (C) 2011 Marcello Coutinho
     All rights reserved.                                                      
-*/
+/*/
 /* ========================================================================== */
 /*
     Redistribution and use in source and binary forms, with or without
@@ -220,6 +220,12 @@
 			<description><![CDATA[<a href="https://www.varnish-cache.org/trac/wiki/BackendPolling">Enter the value of how many of those must have succeeded for us to consider the backend healthy.</a>]]></description>
 			<type>input</type>
 		</field>
+		<field>
+			<fielddescr>Disable Probe</fielddescr>
+			<fieldname>probe_disable</fieldname>
+			<description>Check to disable probing for this backend</description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Mappings</fielddescr>
 			<fieldname>Mappings</fieldname>
-- 
cgit v1.2.3