monitoring experiment statuses and wfnode statuses
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/51f456d8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/51f456d8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/51f456d8 Branch: refs/heads/master Commit: 51f456d8c7e8ae912d43aafc459532f2477600e6 Parents: ce7fad1 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Oct 16 11:22:12 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Oct 16 11:22:12 2014 -0400 ---------------------------------------------------------------------- .../apache/airavata/messaging/core/TestClient.java | 4 ++-- .../apache/airavata/xbaya/messaging/Monitor.java | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/51f456d8/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java index 991b85b..678f1b7 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java @@ -39,7 +39,7 @@ public class TestClient { public static final String RABBITMQ_BROKER_URL = "rabbitmq.broker.url"; public static final String RABBITMQ_EXCHANGE_NAME = "rabbitmq.exchange.name"; private final static Logger logger = LoggerFactory.getLogger(TestClient.class); - private final static String experimentId = "echoExperiment_cc733586-2bf8-4ee2-8a25-6521db135e7f.*"; + private final static String experimentId = "echoExperiment_febc8b78-a66a-4c05-9b1f-1a6ebb0089d8"; public static void main(String[] args) { try { @@ -53,7 +53,7 @@ public class TestClient { Map<String, Object> props = new HashMap<String, Object>(); List<String> routingKeys = new ArrayList<String>(); routingKeys.add(experimentId); - routingKeys.add(experimentId + ".*.*"); + routingKeys.add(experimentId + ".*"); props.put(MessagingConstants.RABBIT_ROUTING_KEY, routingKeys); return props; } http://git-wip-us.apache.org/repos/asf/airavata/blob/51f456d8/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java index b3e7ff4..339df30 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/Monitor.java @@ -22,26 +22,17 @@ package org.apache.airavata.xbaya.messaging; import org.apache.airavata.common.exception.AiravataException; -import org.apache.airavata.common.utils.ThriftUtils; +import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.messaging.core.Consumer; import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.messaging.core.MessageHandler; import org.apache.airavata.messaging.core.MessagingConstants; import org.apache.airavata.messaging.core.impl.RabbitMQConsumer; -import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent; -import org.apache.airavata.model.messaging.event.JobIdentifier; -import org.apache.airavata.model.messaging.event.JobStatusChangeEvent; -import org.apache.airavata.model.messaging.event.Message; import org.apache.airavata.model.messaging.event.MessageType; -import org.apache.airavata.model.messaging.event.TaskIdentifier; -import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent; -import org.apache.airavata.model.messaging.event.WorkflowIdentifier; -import org.apache.airavata.model.messaging.event.WorkflowNodeStatusChangeEvent; import org.apache.airavata.model.workspace.experiment.ExperimentState; import org.apache.airavata.workflow.model.exceptions.WorkflowException; import org.apache.airavata.xbaya.messaging.event.Event; import org.apache.airavata.xbaya.messaging.event.EventProducer; -import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,7 +100,8 @@ public class Monitor extends EventProducer { //Notify listeners that the monitoring is about to start getEventDataRepository().triggerListenerForPreMonitorStart(); try { - this.messageClient = new RabbitMQConsumer(); +// AiravataUtils.setExecutionAsServer(); + this.messageClient = new RabbitMQConsumer("amqp://localhost:5672", "airavata_rabbitmq_exchange"); } catch (AiravataException e) { String msg = "Failed to start the consumer"; logger.error(msg, e); @@ -203,7 +195,7 @@ public class Monitor extends EventProducer { Map<String, Object> props = new HashMap<String, Object>(); List<String> routingKeys = new ArrayList<String>(); routingKeys.add(experimentId); - routingKeys.add(experimentId + ".*.*"); + routingKeys.add(experimentId + ".*"); props.put(MessagingConstants.RABBIT_ROUTING_KEY, routingKeys); return props; }
