This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new 0ad3b1b Adding mistakenly removed status subscriber
0ad3b1b is described below
commit 0ad3b1ba6e84f9e28392a6778a96f9643abc30de
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Thu Oct 18 13:20:43 2018 -0400
Adding mistakenly removed status subscriber
---
.../orchestrator/server/OrchestratorServerHandler.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git
a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index f79a4ba..67aa22b 100644
---
a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++
b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -78,6 +78,7 @@ public class OrchestratorServerHandler implements
OrchestratorService.Iface {
private String airavataUserName;
private String gatewayName;
private Publisher publisher;
+ private final Subscriber statusSubscribe;
private final Subscriber experimentSubscriber;
/**
@@ -98,6 +99,7 @@ public class OrchestratorServerHandler implements
OrchestratorService.Iface {
publisher = MessagingFactory.getPublisher(Type.STATUS);
orchestrator.initialize();
orchestrator.getOrchestratorContext().setPublisher(this.publisher);
+ statusSubscribe = getStatusSubscriber();
experimentSubscriber = getExperimentSubscriber();
} catch (OrchestratorException | AiravataException e) {
log.error(e.getMessage(), e);
@@ -105,6 +107,14 @@ public class OrchestratorServerHandler implements
OrchestratorService.Iface {
}
}
+ private Subscriber getStatusSubscriber() throws AiravataException {
+ List<String> routingKeys = new ArrayList<>();
+// routingKeys.add("*"); // listen for gateway level
messages
+// routingKeys.add("*.*"); // listen for
gateway/experiment level messages
+ routingKeys.add("*.*.*"); // listen for
gateway/experiment/process level messages
+ return MessagingFactory.getSubscriber(new
ProcessStatusHandler(),routingKeys, Type.STATUS);
+ }
+
private Subscriber getExperimentSubscriber() throws AiravataException {
List<String> routingKeys = new ArrayList<>();
routingKeys.add(ServerSettings.getRabbitmqExperimentLaunchQueueName());