fix issue with incorrect parsing of task status

HubSpot · Dec 28, 2015 · 2e31649 · 2e31649
1 parent 9a9646f
commit 2e31649
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/smtp/SingularityMailer.java b/SingularityService/src/main/java/com/hubspot/singularity/smtp/SingularityMailer.java
@@ -7,6 +7,8 @@
 import java.util.Map;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.slf4j.Logger;
@@ -65,6 +67,8 @@ public class SingularityMailer implements Managed {
   private final Joiner adminJoiner;
   private final MailTemplateHelpers mailTemplateHelpers;
 
+  private final static Pattern TASK_STATUS_BY_PATTERN = Pattern.compile("(\\w+) by \\w+");
+
   @Inject
   public SingularityMailer(
       SingularitySmtpSender smtpSender,
@@ -155,13 +159,21 @@ private void populateTaskEmailProperties(Map<String, Object> templateProperties,
     templateProperties.put("taskRan", mailTemplateHelpers.didTaskRun(taskHistory));
   }
 
-  private Optional<TaskCleanupType> getTaskCleanupTypefromSingularityTaskHistoryUpdate(SingularityTaskHistoryUpdate taskHistoryUpdate) {
+  private static Optional<TaskCleanupType> getTaskCleanupTypefromSingularityTaskHistoryUpdate(SingularityTaskHistoryUpdate taskHistoryUpdate) {
     if (!taskHistoryUpdate.getStatusMessage().isPresent()) {
       return Optional.absent();
     }
 
+    String taskCleanupTypeMsg = taskHistoryUpdate.getStatusMessage().get();
+
+    Matcher matcher = TASK_STATUS_BY_PATTERN.matcher(taskCleanupTypeMsg);
+
+    if (matcher.find()) {
+      taskCleanupTypeMsg = matcher.group(1);
+    }
+
     try {
-      return Optional.of(TaskCleanupType.valueOf(taskHistoryUpdate.getStatusMessage().get()));
+      return Optional.of(TaskCleanupType.valueOf(taskCleanupTypeMsg.toUpperCase()));
     } catch (IllegalArgumentException iae) {
       LOG.warn("Couldn't parse TaskCleanupType from update {}", taskHistoryUpdate);
       return Optional.absent();