Updated Branches: refs/heads/master 593451a59 -> 7c51d0418
Changed cartridge agent's topic publisher class to event publisher Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7c51d041 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7c51d041 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7c51d041 Branch: refs/heads/master Commit: 7c51d04180256a1ad682213f96497c190bed40a4 Parents: 593451a Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 4 21:17:08 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 4 21:17:08 2013 +0530 ---------------------------------------------------------------------- .../mgt/listener/InstanceStatusListener.java | 60 +++++++++++--------- .../broker/publish/TopicPublisher.java | 2 +- .../event/subscriber/ArtifactListener.java | 4 +- .../cartridge/agent/event/subscriber/Main.java | 4 +- 4 files changed, 38 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7c51d041/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java index f2cf7c6..fbf4c92 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java @@ -33,34 +33,40 @@ import org.apache.stratos.messaging.util.Util; public class InstanceStatusListener implements MessageListener { - private static final Log log = LogFactory - .getLog(InstanceStatusListener.class); + private static final Log log = LogFactory + .getLog(InstanceStatusListener.class); - @Override - public void onMessage(Message message) { - TextMessage receivedMessage = (TextMessage) message; - String clusterId = null; + @Override + public void onMessage(Message message) { + TextMessage receivedMessage = (TextMessage) message; + if(log.isInfoEnabled()) { + log.info("Instance status message received"); + } - log.info(" --- instance status message received --- "); - try { - String type = message.getStringProperty(Constants.EVENT_CLASS_NAME); - // If member started event is received publish artifact update message - // To do a git clone - if (MemberStartedEvent.class.getName().equals(type)) { - String json = receivedMessage.getText(); - MemberStartedEvent event = (MemberStartedEvent) Util - .jsonToObject(json, MemberStartedEvent.class); - clusterId = event.getClusterId(); - log.info("--- cluster id is --- : " + clusterId); - - CartridgeSubscriptionInfo subscription = PersistenceManager.getSubscriptionFromClusterId(clusterId); - new ArtifactUpdatePublisher(subscription.getRepository(), - clusterId, - String.valueOf(subscription.getTenantId())).publish(); - } - } catch (Exception e) { - e.printStackTrace(); - } - } + try { + String type = message.getStringProperty(Constants.EVENT_CLASS_NAME); + if(log.isInfoEnabled()) { + log.info(String.format("Event class name: %s ", type)); + } + // If member started event is received publish artifact update message + // To do a git clone + if (MemberStartedEvent.class.getName().equals(type)) { + String json = receivedMessage.getText(); + MemberStartedEvent event = (MemberStartedEvent) Util.jsonToObject(json, MemberStartedEvent.class); + String clusterId = event.getClusterId(); + if(log.isInfoEnabled()) { + log.info("Cluster id: " + clusterId); + } + + CartridgeSubscriptionInfo subscription = PersistenceManager.getSubscriptionFromClusterId(clusterId); + ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(subscription.getRepository(), clusterId, String.valueOf(subscription.getTenantId())); + publisher.publish(); + } + } catch (Exception e) { + if(log.isErrorEnabled()) { + log.error("Could not process instance status message", e); + } + } + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7c51d041/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/TopicPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/TopicPublisher.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/TopicPublisher.java index ad39424..7b380ee 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/TopicPublisher.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/publish/TopicPublisher.java @@ -108,7 +108,7 @@ public class TopicPublisher extends MessagePublisher { topicPublisher.publish(textMessage); if (log.isDebugEnabled()) { - log.debug(String.format("Message published: [topic] %s [header] %s [body] %s", getName(), headers.toString(), message)); + log.debug(String.format("Message published: [topic] %s [header] %s [body] %s", getName(), (headers != null) ? headers.toString() : "null", message)); } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7c51d041/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java index 0de55a6..514efb7 100644 --- a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java +++ b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.deployment.synchronizer.RepositoryInformation; import org.apache.stratos.deployment.synchronizer.git.impl.GitBasedArtifactRepository; -import org.apache.stratos.messaging.broker.publish.TopicPublisher; +import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.apache.stratos.messaging.event.artifact.synchronization.ArtifactUpdatedEvent; import org.apache.stratos.messaging.event.instance.status.MemberActivatedEvent; import org.apache.stratos.messaging.util.Constants; @@ -84,7 +84,7 @@ public class ArtifactListener implements MessageListener{ memberActivatedEvent.setServiceName(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.SERVICE_NAME)); memberActivatedEvent.setClusterId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.CLUSTER_ID)); memberActivatedEvent.setMemberId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.MEMBER_ID)); - TopicPublisher publisher = new TopicPublisher(Constants.INSTANCE_STATUS_TOPIC); + EventPublisher publisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC); publisher.publish(memberActivatedEvent); log.info("Member activated event is sent"); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7c51d041/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java index e1c680f..3452f7c 100644 --- a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java +++ b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.broker.publish.TopicPublisher; +import org.apache.stratos.messaging.broker.publish.EventPublisher; import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber; import org.apache.stratos.messaging.event.instance.status.MemberStartedEvent; import org.apache.stratos.messaging.util.Constants; @@ -63,7 +63,7 @@ public class Main { event.setServiceName(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.SERVICE_NAME)); event.setClusterId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.CLUSTER_ID)); event.setMemberId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.MEMBER_ID)); - TopicPublisher publisher = new TopicPublisher(Constants.INSTANCE_STATUS_TOPIC); + EventPublisher publisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC); publisher.publish(event); log.info("Member started event is sent");
