airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject airavata git commit: custom output path
Date Fri, 19 Jun 2015 20:07:54 GMT
Repository: airavata
Updated Branches:
  refs/heads/airavata-0.15-release-branch ed8f049f9 -> c5194d06e


custom output path


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

Branch: refs/heads/airavata-0.15-release-branch
Commit: c5194d06ee3d1e1ef906b99a4b6adc3312d22592
Parents: ed8f049
Author: Chathuri Wimalasena <chathuri@apache.org>
Authored: Fri Jun 19 16:07:47 2015 -0400
Committer: Chathuri Wimalasena <chathuri@apache.org>
Committed: Fri Jun 19 16:07:47 2015 -0400

----------------------------------------------------------------------
 .../org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java   | 4 +++-
 .../java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c5194d06/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
index f9eb1ef..c92e90b 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
@@ -20,6 +20,8 @@
 */
 package org.apache.airavata.gfac.ssh.handler;
 
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.gfac.Constants;
 import org.apache.airavata.gfac.GFacException;
 import org.apache.airavata.gfac.core.context.JobExecutionContext;
 import org.apache.airavata.gfac.core.handler.AbstractHandler;
@@ -90,7 +92,7 @@ public class SSHOutputHandler extends AbstractHandler {
             String timeStampedExperimentID = GFacUtils.createUniqueNameWithDate(jobExecutionContext.getExperimentID());
 
             TaskDetails taskData = jobExecutionContext.getTaskData();
-            String outputDataDir = null;
+            String outputDataDir = ServerSettings.getSetting(Constants.OUTPUT_DATA_DIR);
             File localStdOutFile;
             File localStdErrFile;
             //FIXME: AdvancedOutput is remote location and third party transfer should work
to make this work 

http://git-wip-us.apache.org/repos/asf/airavata/blob/c5194d06/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
index 68ff279..2f8067e 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
@@ -28,8 +28,10 @@ public class HandleOutputs {
 		try {
             String outputDataDir = ServerSettings.getSetting(Constants.OUTPUT_DATA_DIR);
             if (outputDataDir == null){
-                outputDataDir = File.separator + "tmp" + File.separator + jobExecutionContext.getExperimentID();
+                outputDataDir = File.separator + "tmp";
             }
+
+            outputDataDir += File.separator + jobExecutionContext.getExperimentID();
 			(new File(outputDataDir)).mkdirs();
 
 			List<OutputDataObjectType> outputs = jobExecutionContext.getTaskData().getApplicationOutputs();


Mime
View raw message