airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: Fixed issue with alamo mails, which has slightly different format than other resources.
Date Mon, 08 Jun 2015 15:08:57 GMT
Repository: airavata
Updated Branches:
  refs/heads/airavata-0.15-release-branch 6b0f5da17 -> e22277db1


Fixed issue with alamo mails, which has slightly different format than other resources.


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

Branch: refs/heads/airavata-0.15-release-branch
Commit: e22277db1ce8c66b970724d7993ac104a6e55669
Parents: 6b0f5da
Author: Shameera Rathanyaka <shameerainfo@gmail.com>
Authored: Mon Jun 8 11:08:55 2015 -0400
Committer: Shameera Rathanyaka <shameerainfo@gmail.com>
Committed: Mon Jun 8 11:08:55 2015 -0400

----------------------------------------------------------------------
 .../gfac/monitor/email/parser/PBSEmailParser.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/e22277db/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/PBSEmailParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/PBSEmailParser.java
b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/PBSEmailParser.java
index 841ecc4..6504cd0 100644
--- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/PBSEmailParser.java
+++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/parser/PBSEmailParser.java
@@ -33,17 +33,17 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class PBSEmailParser implements EmailParser {
-
     private static final Logger log = LoggerFactory.getLogger(PBSEmailParser.class);
-
-
-    private static final String REGEX = "[a-zA-Z ]*:[ ]*(?<" +  JOBID + ">[a-zA-Z0-9-\\.]*)\\s+[a-zA-Z
]*:[ ]*(?<"+
-            JOBNAME + ">[a-zA-Z0-9-\\.]*)\\s+.*\\s+(?<" + STATUS + ">[a-zA-Z\\ ]*)";
-    private static final String REGEX_EXIT_STATUS = "Exit_status=(?<" + EXIT_STATUS +
">[\\d]+)";
     public static final String BEGUN_EXECUTION = "Begun execution";
     public static final String EXECUTION_TERMINATED = "Execution terminated";
     public static final String ABORTED_BY_PBS_SERVER = "Aborted by PBS Server";
 
+    private static final String REGEX = "[a-zA-Z ]*:[ ]*(?<" + JOBID + ">[a-zA-Z0-9-\\.]*)\\s+[a-zA-Z
]*:[ ]*(?<" +
+            JOBNAME  + ">[a-zA-Z0-9-\\.]*)\\s[\\S|\\s]*(?<" + STATUS + ">" + BEGUN_EXECUTION
+ "|" +
+            EXECUTION_TERMINATED + "|"  + ABORTED_BY_PBS_SERVER + ")";
+
+    private static final String REGEX_EXIT_STATUS = "Exit_status=(?<" + EXIT_STATUS +
">[\\d]+)";
+
     @Override
     public JobStatusResult parseEmail(Message message) throws MessagingException, AiravataException
{
         JobStatusResult jobStatusResult = new JobStatusResult();


Mime
View raw message