From 9c03089271af16b8893fca760f98d1555db3fc0b Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 13 Oct 2009 20:32:50 -0400 Subject: Revert "Allow setting of LB Server mode" This reverts commit c5dfeaf6c31999688034c22b4fcb56477f0b9bd7. --- etc/inc/vslb.inc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index e4faef9..8792386 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -71,19 +71,13 @@ function slbd_configure() { $svrcnt = 0; $svrtxt = ""; $svrtxt = "\t:service-port={$config['load_balancer']['lbpool'][$i]['port']}:\\\n"; - if($config['load_balancer']['lbpool']) { - if(is_array($config['load_balancer']['lbpool'][$i]['servers'])) { + if($config['load_balancer']['lbpool']) + if(is_array($config['load_balancer']['lbpool'][$i]['servers'])) foreach ($config['load_balancer']['lbpool'][$i]['servers'] as $lbsvr) { $svrtxt .= "\t:{$svrcnt}={$lbsvr}:\\\n"; $svrcnt++; } - } - } - if($config['load_balancer']['lbpool'][$i]['behaviour']) - $lb_pool_behaviour = $config['load_balancer']['lbpool'][$i]['behaviour']; - else - $lb_pool_behaviour = "round-robin"; - $slbdconf .= "\t:method={$lb_pool_behaviour}:\\\n"; + $slbdconf .= "\t:method=round-robin:\\\n"; $slbdconf .= "\t:services={$svrcnt}:\\\n"; $slbdconf .= $svrtxt; if($config['load_balancer']['lbpool'][$i]['monitor'] == "ICMP") { -- cgit v1.1