Repository: airavata Updated Branches: refs/heads/master eeb00a39c -> bf37ea8ec
Adding more precise logs to gsissh operations, so invokers doesn't always have tlog Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bf37ea8e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bf37ea8e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bf37ea8e Branch: refs/heads/master Commit: bf37ea8ec57acd49ef845c25341d3218c5d85078 Parents: eeb00a3 Author: lahiru <[email protected]> Authored: Thu Mar 13 00:16:13 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Mar 13 00:16:13 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/handler/SCPOutputHandler.java | 2 -- .../org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/bf37ea8e/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java index 3967305..5f6d706 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java @@ -94,9 +94,7 @@ public class SCPOutputHandler extends AbstractHandler{ localStdOutFile = File.createTempFile(timeStampedServiceName, "stdout"); localStdErrFile = File.createTempFile(timeStampedServiceName, "stderr"); } - log.info("Downloading file : " + app.getStandardError() + " to : " + localStdErrFile.getAbsolutePath()); cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); - log.info("Downloading file : " + app.getStandardOutput() + " to : " + localStdOutFile.getAbsolutePath()); cluster.scpFrom(app.getStandardError(), localStdErrFile.getAbsolutePath()); String stdOutStr = GFacUtils.readFileToString(localStdOutFile.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/airavata/blob/bf37ea8e/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java index b55f2c1..87416e1 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java @@ -344,6 +344,7 @@ public class GSISSHAbstractCluster implements Cluster { public void scpTo(String remoteFile, String localFile) throws SSHApiException { try { + log.info("Transfering file:/" + localFile + " To:" + serverInfo.getHost() + ":" + remoteFile); SSHUtils.scpTo(remoteFile, localFile, session); } catch (IOException e) { throw new SSHApiException("Failed during scping local file:" + localFile + " to remote file " @@ -356,6 +357,7 @@ public class GSISSHAbstractCluster implements Cluster { public void scpFrom(String remoteFile, String localFile) throws SSHApiException { try { + log.info("Transfering from:"+ serverInfo + ":" + remoteFile + " To:" + "file:/" + localFile); SSHUtils.scpFrom(remoteFile, localFile, session); } catch (IOException e) { throw new SSHApiException("Failed during scping local file:" + localFile + " to remote file " @@ -368,6 +370,7 @@ public class GSISSHAbstractCluster implements Cluster { public void makeDirectory(String directoryPath) throws SSHApiException { try { + log.info("Creating directory: " + serverInfo.getHost() + ":" + directoryPath); SSHUtils.makeDirectory(directoryPath, session); } catch (IOException e) { throw new SSHApiException("Failed during creating directory:" + directoryPath + " to remote file " @@ -380,6 +383,7 @@ public class GSISSHAbstractCluster implements Cluster { public List<String> listDirectory(String directoryPath) throws SSHApiException { try { + log.info("Listing directory: " + serverInfo.getHost() + ":" + directoryPath); return SSHUtils.listDirectory(directoryPath, session); } catch (IOException e) { throw new SSHApiException("Failed during creating directory:" + directoryPath + " to remote file "
