Updated Branches: refs/heads/master 5a43d560b -> eeabf459f
MemberID null check refine when member_fault event messages received Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/18e83aaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/18e83aaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/18e83aaf Branch: refs/heads/master Commit: 18e83aaf0d1b7b687233e0717c1f9f5e6b27201e Parents: 6029d2b Author: Udara Liyanage <[email protected]> Authored: Tue Dec 3 14:11:09 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 3 14:11:09 2013 -0500 ---------------------------------------------------------------------- .../message/receiver/health/HealthEventMessageDelegator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/18e83aaf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java index 55d3018..2f0a3e2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java @@ -60,7 +60,7 @@ public class HealthEventMessageDelegator implements Runnable { messageProperties = setEventValues(messageText); this.clusterId = messageProperties.get("cluster_id"); - log.info("Received event " + eventName); + log.info("Received event " + eventName + " for cluster " + this.clusterId); if(Constants.AVERAGE_REQUESTS_IN_FLIGHT.equals(eventName)){ Float messageValue = Float.parseFloat(messageProperties.get("value")); @@ -75,8 +75,9 @@ public class HealthEventMessageDelegator implements Runnable { AutoscalerContext.getInstance().getClusterContext(clusterId).setRequestsInFlightSecondDerivative(messageValue); }else if (Constants.MEMBER_FAULT_EVENT_NAME.equals(eventName)){ + String memberId = messageProperties.get("member_id"); - if(memberId != null && !memberId.isEmpty()) + if(memberId == null || memberId.isEmpty()) log.error("MemberId is not included in the received message"); handleMemberfaultEvent(memberId); }
