Updated Branches: refs/heads/vpc 1aa4ed84b -> d49776938
CS-15713 : remove listen section, when ld is removed Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d4977693 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d4977693 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d4977693 Branch: refs/heads/vpc Commit: d49776938b3dceca538caa0281ac78d9b3697619 Parents: 1aa4ed8 Author: anthony <[email protected]> Authored: Wed Aug 1 17:15:49 2012 -0700 Committer: anthony <[email protected]> Committed: Wed Aug 1 17:22:34 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/HAProxyConfigurator.java | 20 ++++++++------ 1 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d4977693/core/src/com/cloud/network/HAProxyConfigurator.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/network/HAProxyConfigurator.java b/core/src/com/cloud/network/HAProxyConfigurator.java index 1cd25b1..7f6c713 100644 --- a/core/src/com/cloud/network/HAProxyConfigurator.java +++ b/core/src/com/cloud/network/HAProxyConfigurator.java @@ -573,20 +573,22 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator { } result.add(getBlankLine()); - - if (lbCmd.getLoadBalancers().length == 0) { + boolean has_listener = false; + for (LoadBalancerTO lbTO : lbCmd.getLoadBalancers()) { + if ( lbTO.isRevoked() ) { + continue; + } + List<String> poolRules = getRulesForPool(lbTO); + result.addAll(poolRules); + has_listener = true; + } + result.add(getBlankLine()); + if ( !has_listener) { // haproxy cannot handle empty listen / frontend or backend, so add // a dummy listener // on port 9 result.addAll(Arrays.asList(defaultListen)); } - result.add(getBlankLine()); - - for (LoadBalancerTO lbTO : lbCmd.getLoadBalancers()) { - List<String> poolRules = getRulesForPool(lbTO); - result.addAll(poolRules); - } - return result.toArray(new String[result.size()]); }
