Repository: stratos Updated Branches: refs/heads/stratos-4.1.x f7d6649fe -> 6ed9bf662
Fixing port mapping issue in nginx extension Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6ed9bf66 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6ed9bf66 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6ed9bf66 Branch: refs/heads/stratos-4.1.x Commit: 6ed9bf6627b665a34111e07a4c99a1b95172c390 Parents: f7d6649 Author: Imesh Gunaratne <[email protected]> Authored: Fri Aug 28 18:35:30 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Aug 28 18:35:30 2015 +0530 ---------------------------------------------------------------------- .../stratos/nginx/extension/NginxConfigWriter.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6ed9bf66/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java b/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java index a7adad8..6f6a77c 100644 --- a/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java +++ b/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxConfigWriter.java @@ -62,10 +62,7 @@ public class NginxConfigWriter { for (Service service : topology.getServices()) { for (Cluster cluster : service.getClusters()) { - if ((service.getPorts() == null) || (service.getPorts().size() == 0)) { - throw new RuntimeException(String.format("No ports found in service: %s", service.getServiceName())); - } - generateConfigurationForCluster(cluster, service.getPorts(), configurationBuilder); + generateConfigurationForCluster(cluster, configurationBuilder); } } @@ -127,10 +124,17 @@ public class NginxConfigWriter { * } * } * @param cluster - * @param ports * @param text */ - private void generateConfigurationForCluster(Cluster cluster, Collection<Port> ports, StringBuilder text) { + private void generateConfigurationForCluster(Cluster cluster, StringBuilder text) { + + if((cluster.getMembers() == null) || (cluster.getMembers().size() == 0)) { + return; + } + + // Find port mappings + Member firstMember = (Member) cluster.getMembers().toArray()[0]; + Collection<Port> ports = firstMember.getPorts(); for (Port port : ports) { for (String hostname : cluster.getHostNames()) {
