apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-15713 : remove listen section, when ld is removed

Browse Source
This commit is contained in:
anthony 2012-08-01 17:15:49 -07:00
parent 1aa4ed84b9
commit d49776938b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/cloud/network/HAProxyConfigurator.java
View File

@ -573,20 +573,22 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
} }
result.add(getBlankLine()); result.add(getBlankLine());
boolean has_listener = false;
if (lbCmd.getLoadBalancers().length == 0) { 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 // haproxy cannot handle empty listen / frontend or backend, so add
// a dummy listener // a dummy listener
// on port 9 // on port 9
result.addAll(Arrays.asList(defaultListen)); 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()]); return result.toArray(new String[result.size()]);
} }