You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/25 14:56:30 UTC
git commit: Added instance status message delegator in cloud
controller service component
Updated Branches:
refs/heads/master 449723952 -> 22882d6f9
Added instance status message delegator in cloud controller service component
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/22882d6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/22882d6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/22882d6f
Branch: refs/heads/master
Commit: 22882d6f9faa84a400438a79c42d77b887581def
Parents: 4497239
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 25 19:26:21 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 25 19:26:21 2013 +0530
----------------------------------------------------------------------
.../cloud/controller/internal/CloudControllerDSComponent.java | 6 ++++++
.../instance/status/InstanceStatusEventMessageListener.java | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/22882d6f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
index c458d49..b750da4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
@@ -28,6 +28,7 @@ import org.apache.stratos.cloud.controller.impl.CloudControllerServiceImpl;
import org.apache.stratos.cloud.controller.interfaces.CloudControllerService;
import org.apache.stratos.cloud.controller.publisher.TopologySynchronizerTaskScheduler;
import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
+import org.apache.stratos.cloud.controller.topic.instance.status.InstanceStatusEventMessageDelegator;
import org.apache.stratos.cloud.controller.topic.instance.status.InstanceStatusEventMessageListener;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.ServiceReferenceHolder;
@@ -76,6 +77,11 @@ public class CloudControllerDSComponent {
subscriber.setMessageListener(new InstanceStatusEventMessageListener());
Thread tsubscriber = new Thread(subscriber);
tsubscriber.start();
+
+ // Start instance status message delegator
+ InstanceStatusEventMessageDelegator delegator = new InstanceStatusEventMessageDelegator();
+ Thread tdelegator = new Thread(delegator);
+ tdelegator.start();
// Register cloud controller service
BundleContext bundleContext = context.getBundleContext();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/22882d6f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java
index 7f40036..891b92d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topic/instance/status/InstanceStatusEventMessageListener.java
@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.topology.TopologyManager;
+import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.TextMessage;
@@ -37,7 +38,11 @@ public class InstanceStatusEventMessageListener implements MessageListener{
TextMessage receivedMessage = (TextMessage) message;
InstanceStatusEventMessageQueue.getInstance().add(receivedMessage);
if(log.isDebugEnabled()) {
- log.debug(String.format("Instance status message added to queue: %s", message));
+ try {
+ log.debug(String.format("Instance status message added to queue: %s", receivedMessage.getText()));
+ } catch (JMSException e) {
+ log.error(e);
+ }
}
}
}