From 6ce02af23da46d2aa84723285313f6a9c87458d5 Mon Sep 17 00:00:00 2001
From: thompsa <andy@fud.org.nz>
Date: Fri, 12 Mar 2010 16:02:01 +1300
Subject: Dont restart haproxy unless we are doing carp checks or reloading.

---
 config/haproxy-dev/haproxy.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/haproxy-dev/haproxy.inc b/config/haproxy-dev/haproxy.inc
index dc9b8983..61cc71e6 100644
--- a/config/haproxy-dev/haproxy.inc
+++ b/config/haproxy-dev/haproxy.inc
@@ -569,7 +569,9 @@ function haproxy_check_run($reload) {
 			}
 			log_error("Starting haproxy on CARP master.");
 			/* fallthrough */
-		}
+		} else if ($reload == 0))
+			return (0);
+
 		if (haproxy_is_running()) {
 			exec("/usr/local/sbin/haproxy -f /var/etc/haproxy.cfg -p /var/run/haproxy.pid -st `cat /var/run/haproxy.pid`");
 		} else {
-- 
cgit v1.2.3