aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/haproxy/haproxy.inc8
-rwxr-xr-xconfig/haproxy/haproxy_servers_edit.php12
2 files changed, 17 insertions, 3 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 034e3f9d..15a5a84d 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -245,8 +245,12 @@ function haproxy_configure() {
} else {
$advanced_txt = "";
}
+ if($server['checkinter'])
+ $checkinter = "check inter {$server['checkinter']}";
+ else
+ $checkinter = "check inter 1000";
foreach($server_ports as $pport)
- fwrite ($fd, "\tserver\t\t\t" . $server['name'] . " " . $server['address'].":" . $pport . " $cookie " . " check inter 1000 weight " . $server['weight'] . "{$advanced_txt}\n");
+ fwrite ($fd, "\tserver\t\t\t" . $server['name'] . " " . $server['address'].":" . $pport . " $cookie " . " $checkinter weight " . $server['weight'] . "{$advanced_txt}\n");
}
}
}
@@ -274,6 +278,8 @@ function haproxy_configure() {
// create config file
fclose($fd);
+ exec("");
+
// reload haproxy
if(isset($a_global['enable'])) {
if(is_process_running('haproxy')) {
diff --git a/config/haproxy/haproxy_servers_edit.php b/config/haproxy/haproxy_servers_edit.php
index cf53e88b..c28dc7af 100755
--- a/config/haproxy/haproxy_servers_edit.php
+++ b/config/haproxy/haproxy_servers_edit.php
@@ -51,6 +51,7 @@ if (isset($id) && $a_server[$id]) {
$pconfig['port'] = $a_server[$id]['port'];
$pconfig['backend'] = $a_server[$id]['backend'];
$pconfig['weight'] = $a_server[$id]['weight'];
+ $pconfig['checkinter'] = $a_server[$id]['checkinter'];
$pconfig['cookie'] = $a_server[$id]['cookie'];
$pconfig['status'] = $a_server[$id]['status'];
$pconfig['advanced'] = base64_decode($a_server[$id]['advanced']);
@@ -124,7 +125,8 @@ if ($_POST) {
update_if_changed("status", $server['status'], $_POST['status']);
update_if_changed("address", $server['address'], $_POST['address']);
update_if_changed("advanced", $server['advanced'], base64_encode($_POST['advanced']));
-
+ update_if_changed("checkinter", $server['checkinter'], $_POST['checkinter']);
+
if (isset($id) && $a_server[$id]) {
$a_server[$id] = $server;
} else {
@@ -286,6 +288,13 @@ function clearcombo(){
</td>
</tr>
<tr align="left">
+ <td width="22%" valign="top" class="vncell">Check inter</td>
+ <td width="78%" class="vtable" colspan="2">
+ <input name="weight" type="text" <?if(isset($pconfig['checkinter'])) echo "value=\"{$pconfig['checkinter']}\"";?>size="64">
+ <br/>Defaults to 1000 if left blank.
+ </td>
+ </tr>
+ <tr align="left">
<td width="22%" valign="top" class="vncell">Weight</td>
<td width="78%" class="vtable" colspan="2">
<input name="weight" type="text" <?if(isset($pconfig['weight'])) echo "value=\"{$pconfig['weight']}\"";?>size="64"><br/>
@@ -295,7 +304,6 @@ function clearcombo(){
is recommended to start with values which can both grow and shrink, for
instance between 10 and 100 to leave enough room above and below for later
adjustments.
-
</td>
</tr>
<tr align="left">