Repository: stratos Updated Branches: refs/heads/4.0.0 5190c1513 -> ee7171496
fix for STRATOS-703 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ee717149 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ee717149 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ee717149 Branch: refs/heads/4.0.0 Commit: ee7171496e8e8d4afbefc20a21a5c5528ca4b01d Parents: 5190c15 Author: Dinesh Bandara <[email protected]> Authored: Thu Jul 10 09:03:37 2014 +0530 Committer: Dinesh Bandara <[email protected]> Committed: Thu Jul 10 09:03:37 2014 +0530 ---------------------------------------------------------------------- .../extension/HAProxyStatisticsReader.java | 39 ++++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ee717149/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java index 676f522..f564e7c 100644 --- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java +++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java @@ -60,28 +60,27 @@ public class HAProxyStatisticsReader implements LoadBalancerStatisticsReader { } for (Port port : service.getPorts()) { - frontendId = cluster.getClusterId() + "-host-" + HAProxyContext.getInstance().getHAProxyPrivateIp() + "-proxy-" + port.getProxy(); - //frontendId = cluster.getClusterId() + "-proxy-" + port.getProxy(); - backendId = frontendId + "-members"; - - for (Member member : cluster.getMembers()) { - // echo "get weight <backend>/<server>" | socat stdio <stats-socket> - command = String.format("%s/get-weight.sh %s %s %s", scriptsPath, backendId, member.getMemberId(), statsSocketFilePath); - try { - output = CommandUtils.executeCommand(command); - if ((output != null) && (output.length() > 0)) { - array = output.split(" "); - if ((array != null) && (array.length > 0)) { - weight = Integer.parseInt(array[0]); - if (log.isDebugEnabled()) { - log.debug(String.format("Member weight found: [cluster] %s [member] %s [weight] %d", member.getClusterId(), member.getMemberId(), weight)); + for(String hostname : cluster.getHostNames()) { + backendId = hostname+"-http-members"; + for (Member member : cluster.getMembers()) { + // echo "get weight <backend>/<server>" | socat stdio <stats-socket> + command = String.format("%s/get-weight.sh %s %s %s", scriptsPath, backendId, member.getMemberId(), statsSocketFilePath); + try { + output = CommandUtils.executeCommand(command); + if ((output != null) && (output.length() > 0)) { + array = output.split(" "); + if ((array != null) && (array.length > 0)) { + weight = Integer.parseInt(array[0]); + if (log.isDebugEnabled()) { + log.debug(String.format("Member weight found: [cluster] %s [member] %s [weight] %d", member.getClusterId(), member.getMemberId(), weight)); + } + totalWeight += weight; } - totalWeight += weight; } - } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error(e); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error(e); + } } } }
