Repository: airavata Updated Branches: refs/heads/develop 55fe7bad6 -> 3582fefa6
Init experiment catalog before subscribe to experiment launch Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3582fefa Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3582fefa Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3582fefa Branch: refs/heads/develop Commit: 3582fefa6df74877a21072460d0f950451333915 Parents: 55fe7ba Author: Shameera Rathnayaka <[email protected]> Authored: Tue Nov 22 16:27:21 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Nov 22 16:27:45 2016 -0500 ---------------------------------------------------------------------- .../server/OrchestratorServerHandler.java | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3582fefa/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- 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 df5865e..ca78c89 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 @@ -94,30 +94,20 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { } public OrchestratorServerHandler() throws OrchestratorException{ - try { - publisher = MessagingFactory.getPublisher(Type.STATUS); - List<String> routingKeys = new ArrayList<>(); - routingKeys.add(ServerSettings.getRabbitmqExperimentLaunchQueueName()); - experimentSubscriber = MessagingFactory.getSubscriber(new ExperimentHandler(), routingKeys, Type.EXPERIMENT_LAUNCH); - setAiravataUserName(ServerSettings.getDefaultUser()); - } catch (AiravataException e) { - log.error(e.getMessage(), e); - throw new OrchestratorException("Error while initializing orchestrator service", e); - } // orchestrator init try { // first constructing the monitorManager and orchestrator, then fill // the required properties + setAiravataUserName(ServerSettings.getDefaultUser()); orchestrator = new SimpleOrchestratorImpl(); experimentCatalog = RegistryFactory.getDefaultExpCatalog(); appCatalog = RegistryFactory.getAppCatalog(); + + publisher = MessagingFactory.getPublisher(Type.STATUS); orchestrator.initialize(); orchestrator.getOrchestratorContext().setPublisher(this.publisher); - 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 - statusSubscribe = MessagingFactory.getSubscriber(new ProcessStatusHandler(),routingKeys, Type.STATUS); + statusSubscribe = getStatusSubscriber(); + experimentSubscriber = getExperimentSubscriber(); startCurator(); } catch (OrchestratorException | RegistryException | AppCatalogException | AiravataException e) { log.error(e.getMessage(), e); @@ -125,7 +115,21 @@ 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()); + return MessagingFactory.getSubscriber(new ExperimentHandler(), routingKeys, Type.EXPERIMENT_LAUNCH); + } + + /** * * After creating the experiment Data user have the * experimentID as the * handler to the experiment, during the launchProcess * We just have to * give the experimentID * * @param experimentID * @return sucess/failure *
