Repository: airavata Updated Branches: refs/heads/master 583ed3010 -> 4d254f1f3
more logs for monitoing - AIRAVATA-1023 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4d254f1f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4d254f1f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4d254f1f Branch: refs/heads/master Commit: 4d254f1f397484280927b61fc53b10807d10575e Parents: 583ed30 Author: lahiru <[email protected]> Authored: Tue Mar 11 12:09:08 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue Mar 11 12:09:08 2014 -0400 ---------------------------------------------------------------------- .../airavata/job/monitor/impl/push/amqp/JSONMessageParser.java | 1 + .../org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java | 2 +- .../org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4d254f1f/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java index 4ec96a8..95192d1 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java @@ -38,6 +38,7 @@ public class JSONMessageParser implements MessageParser { /*todo write a json message parser here*/ logger.info("Mesage parse invoked"); System.out.println(message); +// JSONParser parser = new JSONParser(); ObjectMapper mapper = new ObjectMapper(); try { mapper.readTree(message); http://git-wip-us.apache.org/repos/asf/airavata/blob/4d254f1f/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java index e5a08b7..4bf4b00 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmJobConfiguration.java @@ -63,7 +63,7 @@ public class SlurmJobConfiguration implements JobManagerConfiguration{ } public RawCommandInfo getMonitorCommand(String jobID) { - return new RawCommandInfo(this.installedPath + "squeue -v -j " + jobID); + return new RawCommandInfo(this.installedPath + "squeue -j " + jobID); } public String getScriptExtension() { http://git-wip-us.apache.org/repos/asf/airavata/blob/4d254f1f/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java index 2cf1614..5aeee94 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java @@ -101,7 +101,7 @@ public class SlurmOutputParser implements OutputParser { } public JobStatus parse(String jobID, String rawOutput) { - log.debug(rawOutput); + log.info(rawOutput); String[] info = rawOutput.split("\n"); String lastString = info[info.length -1]; if (lastString.contains("JOBID") || lastString.contains("PARTITION")) {
