diff --git a/src/main/java/com/ctrip/zeus/nginx/conf/LBConf.java b/src/main/java/com/ctrip/zeus/nginx/conf/LBConf.java index ff37325e..3402b95d 100644 --- a/src/main/java/com/ctrip/zeus/nginx/conf/LBConf.java +++ b/src/main/java/com/ctrip/zeus/nginx/conf/LBConf.java @@ -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 ""; } } diff --git a/src/main/java/com/ctrip/zeus/nginx/conf/UpstreamsConf.java b/src/main/java/com/ctrip/zeus/nginx/conf/UpstreamsConf.java index 2f780431..a52aeb2f 100644 --- a/src/main/java/com/ctrip/zeus/nginx/conf/UpstreamsConf.java +++ b/src/main/java/com/ctrip/zeus/nginx/conf/UpstreamsConf.java @@ -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()) {