etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
anthony 2012-08-01 17:15:49 -07:00
parent b57501885f
commit 3efec6456a
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

@ -569,20 +569,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()]);
}