Updated Branches: refs/heads/master 122658996 -> 945f333ba
Added condition to wait health event message delegator until topology is initialized Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/db958c4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/db958c4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/db958c4d Branch: refs/heads/master Commit: db958c4d0a77f760f3be5be4ad91ba3da6af2ccc Parents: 3fca23c Author: Imesh Gunaratne <[email protected]> Authored: Sat Dec 28 02:21:27 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sat Dec 28 02:21:27 2013 +0530 ---------------------------------------------------------------------- .../receiver/health/HealthEventMessageDelegator.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/db958c4d/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 e02f6a5..e5e07b3 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 @@ -55,16 +55,23 @@ public class HealthEventMessageDelegator implements Runnable { @Override public void run() { - log.info("Health event message delegator started"); + if(log.isInfoEnabled()) { + log.info("Health event message delegator started"); + } + + if(log.isDebugEnabled()) { + log.debug("Waiting for topology to be initialized"); + } + while(!TopologyManager.getTopology().isInitialized()); while (!terminate) { try { TextMessage message = HealthEventQueue.getInstance().take(); String messageText = message.getText(); - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) { log.debug("Health event message received: [message] " + messageText); - + } Event event = jsonToEvent(messageText); String eventName = event.getEventName();
