airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [50/50] [abbrv] airavata git commit: Use default gateway Id if credential reader fail to retrieve the gateway id using token.
Date Thu, 26 Mar 2015 17:08:49 GMT
Use default gateway Id if credential reader fail to retrieve the gateway id using token.


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a6c483cd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a6c483cd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a6c483cd

Branch: refs/heads/master
Commit: a6c483cdb07da24f5c9875c2a321c516b9723d78
Parents: 220e041
Author: shamrath <shameerainfo@gmail.com>
Authored: Thu Mar 26 13:05:12 2015 -0400
Committer: shamrath <shameerainfo@gmail.com>
Committed: Thu Mar 26 13:05:12 2015 -0400

----------------------------------------------------------------------
 .../server/src/main/resources/airavata-server.properties       | 2 +-
 .../orchestrator/server/OrchestratorServerHandler.java         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/a6c483cd/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index b957922..38a6fdd 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -220,7 +220,7 @@ connection.name=xsede
 #publisher
 rabbitmq.broker.url=amqp://localhost:5672
 
-activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataTaskStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.api.server.listener.AiravataExperimentStatusUpdator,org.apache.airavata.gfac.core.monitor.GfacInternalStatusUpdator,org.apache.airavata.workflow.engine.util.ProxyMonitorPublisher
+activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataTaskStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.api.server.listener.AiravataExperimentStatusUpdator,org.apache.airavata.gfac.core.monitor.GfacInternalStatusUpdator
 publish.rabbitmq=false
 status.publisher=org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher
 task.launch.publisher=org.apache.airavata.messaging.core.impl.RabbitMQTaskLaunchPublisher

http://git-wip-us.apache.org/repos/asf/airavata/blob/a6c483cd/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 9cf44a9..0297cb6 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -246,7 +246,9 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface,
                 }
             }
             if (gatewayId == null) {
-                throw new AiravataException("Couldn't identify the gateway Id using the credential
token");
+                gatewayId = ServerSettings.getDefaultUserGateway();
+                log.info("Couldn't identify the gateway Id using the credential token, Use
default gateway Id");
+//                throw new AiravataException("Couldn't identify the gateway Id using the
credential token");
             }
             ExecutionType executionType = DataModelUtils.getExecutionType(gatewayId, experiment);
             if (executionType == ExecutionType.SINGLE_APP) {
@@ -262,7 +264,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface,
                 throw new TException("Experiment '" + experimentId + "' launch failed. Unable
to figureout execution type for application " + experiment.getApplicationId());
             }
         } catch (Exception e) {
-            throw new TException("Experiment '" + experimentId + "' launch failed. Unable
to figureout execution type for application " + experiment.getApplicationId());
+            throw new TException("Experiment '" + experimentId + "' launch failed. Unable
to figureout execution type for application " + experiment.getApplicationId(), e);
         }
         return true;
 	}


Mime
View raw message