summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2011-05-05 01:39:28 +0200
committerWarren Baker <warren@decoy.co.za>2011-05-05 01:39:28 +0200
commit4a916dc89b36b92ba1a7076af04b157ca88990d7 (patch)
tree56cdab6eca6ef6241bf27815f27e4cf92566df8c
parent8b1e7d04da1a2e1cefbad4b595033cedff4685e5 (diff)
downloadpfsense-4a916dc89b36b92ba1a7076af04b157ca88990d7.zip
pfsense-4a916dc89b36b92ba1a7076af04b157ca88990d7.tar.gz
Timeout is either a global option and/or a table stanza option. For now made it a global option.
For the future each pool should probably have a configurable timeout.
-rw-r--r--etc/inc/vslb.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc
index 84bc3da..980bcd0 100644
--- a/etc/inc/vslb.inc
+++ b/etc/inc/vslb.inc
@@ -202,6 +202,7 @@ function relayd_configure() {
/* reindex pools by name as we loop through the pools array */
$pools = array();
$conf .= "log updates \n";
+ $conf .= "timeout 1000 \n";
/* Virtual server pools */
if(is_array($pool_a)) {
for ($i = 0; isset($pool_a[$i]); $i++) {
@@ -239,14 +240,14 @@ function relayd_configure() {
case 'redirect_mode': {
$conf .= "redirect \"{$vs_a[$i]['name']}\" {\n";
$conf .= " listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n";
- $conf .= " forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n";
+ $conf .= " forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
if (isset($config['system']['lb_use_sticky']))
$conf .= " sticky-address\n";
# sitedown MUST use the same port as the primary pool - sucks, but it's a relayd thing
if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0)
- $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n";
+ $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
$conf .= "}\n";
break;
@@ -255,10 +256,10 @@ function relayd_configure() {
$conf .= "relay \"{$vs_a[$i]['name']}\" {\n";
$conf .= " listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n";
$conf .= " protocol \"{$vs_a[$i]['relay_protocol']}\"\n";
- $conf .= " forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n";
+ $conf .= " forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0)
- $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n";
+ $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
$conf .= "}\n";
break;
}
OpenPOWER on IntegriCloud