diff options
| author | thompsa <andy@fud.org.nz> | 2010-03-12 16:02:01 +1300 |
|---|---|---|
| committer | thompsa <andy@fud.org.nz> | 2010-03-12 16:02:01 +1300 |
| commit | 6ce02af23da46d2aa84723285313f6a9c87458d5 (patch) | |
| tree | 2f5b0a89d1257873c43b768d83c4996bb4ffa26a | |
| parent | c68429d0148425c085cb16ab33bb6b054fa9a558 (diff) | |
| download | pfsense-packages-6ce02af23da46d2aa84723285313f6a9c87458d5.tar.gz pfsense-packages-6ce02af23da46d2aa84723285313f6a9c87458d5.tar.bz2 pfsense-packages-6ce02af23da46d2aa84723285313f6a9c87458d5.zip | |
Dont restart haproxy unless we are doing carp checks or reloading.
| -rw-r--r-- | config/haproxy-dev/haproxy.inc | 4 |
1 files changed, 3 insertions, 1 deletions
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 { |