ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-22 08:36:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixbug: lb method

Browse source
This commit is contained in:
xingchaowang 2015-03-10 21:48:50 +08:00
parent 6875f0d8f5
commit 571213a4a9
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/ctrip/zeus/nginx/conf/LBConf.java
View file

@ -15,14 +15,14 @@ public class LBConf {
LoadBalancingMethod lb = app.getLoadBalancingMethod();
String type = lb.getType();
if (LBMethod.LESS_CONN.toString().equalsIgnoreCase(type)) {
return "less_conn;";
return "less_conn;\n";
}
if (LBMethod.IP_HASH.toString().equalsIgnoreCase(type)) {
return "ip_hash;";
return "ip_hash;\n";
}
if (LBMethod.HASH.toString().equalsIgnoreCase(type)) {
return "hash " + lb.getValue() + ";";
return "hash " + lb.getValue() + ";\n";
}
return "round_robin";
return "";
}
}

5
src/main/java/com/ctrip/zeus/nginx/conf/UpstreamsConf.java
View file

@ -28,7 +28,10 @@ public class UpstreamsConf {
StringBuilder b = new StringBuilder(1024);
b.append("upstream ").append(upstreamName).append(" {").append("\n");
b.append(" ").append(LBConf.generate(slb, vs, app)).append(";\n");
//LBMethod
b.append(" ").append(LBConf.generate(slb, vs, app));
b.append(" ").append("zone " + upstreamName + " 64K").append(";\n");
for (AppServer as : app.getAppServers()) {