Details
diff --git a/azkaban-common/src/main/java/azkaban/executor/mail/DefaultMailCreator.java b/azkaban-common/src/main/java/azkaban/executor/mail/DefaultMailCreator.java
index 1e221d5..bedb884 100644
--- a/azkaban-common/src/main/java/azkaban/executor/mail/DefaultMailCreator.java
+++ b/azkaban-common/src/main/java/azkaban/executor/mail/DefaultMailCreator.java
@@ -70,8 +70,8 @@ public class DefaultMailCreator implements MailCreator {
+ azkabanName);
message.println("<h2 style=\"color:#FF0000\"> Execution '"
- + flow.getExecutionId() + "' of flow '" + flow.getFlowId()
- + "' has encountered a failure on " + azkabanName + "</h2>");
+ + flow.getExecutionId() + "' of flow '" + flow.getFlowId() + "' of project '"
+ + flow.getProjectName() + "' has encountered a failure on " + azkabanName + "</h2>");
if (option.getFailureAction() == FailureAction.CANCEL_ALL) {
message
@@ -134,8 +134,8 @@ public class DefaultMailCreator implements MailCreator {
+ azkabanName);
message.println("<h2 style=\"color:#FF0000\"> Execution '" + execId
- + "' of flow '" + flow.getFlowId() + "' has failed on " + azkabanName
- + "</h2>");
+ + "' of flow '" + flow.getFlowId() + "' of project '"
+ + flow.getProjectName() + "' has failed on " + azkabanName + "</h2>");
message.println("<table>");
message.println("<tr><td>Start Time</td><td>"
+ convertMSToString(flow.getStartTime()) + "</td></tr>");
@@ -188,8 +188,8 @@ public class DefaultMailCreator implements MailCreator {
+ azkabanName);
message.println("<h2> Execution '" + flow.getExecutionId()
- + "' of flow '" + flow.getFlowId() + "' has succeeded on "
- + azkabanName + "</h2>");
+ + "' of flow '" + flow.getFlowId() + "' of project '"
+ + flow.getProjectName() + "' has succeeded on " + azkabanName + "</h2>");
message.println("<table>");
message.println("<tr><td>Start Time</td><td>"
+ convertMSToString(flow.getStartTime()) + "</td></tr>");
diff --git a/azkaban-common/src/test/resources/azkaban/executor/mail/errorEmail.html b/azkaban-common/src/test/resources/azkaban/executor/mail/errorEmail.html
index 833eb8c..610f883 100644
--- a/azkaban-common/src/test/resources/azkaban/executor/mail/errorEmail.html
+++ b/azkaban-common/src/test/resources/azkaban/executor/mail/errorEmail.html
@@ -1 +1 @@
-<h2 style="color:#FF0000"> Execution '-1' of flow 'mail-creator-test' has failed on unit-tests</h2><table><tr><td>Start Time</td><td>2016/07/17 11:54:11 EEST</td></tr><tr><td>End Time</td><td>2016/07/17 11:54:16 EEST</td></tr><tr><td>Duration</td><td>5 sec</td></tr><tr><td>Status</td><td>FAILED</td></tr></table><a href="http://localhost:8081/executor?execid=-1">mail-creator-test Execution Link</a><h3>Reason</h3><ul><li><a href="http://localhost:8081/executor?execid=-1&job=test-job">Failed job 'test-job' Link</a></li></ul>
+<h2 style="color:#FF0000"> Execution '-1' of flow 'mail-creator-test' of project 'test-project' has failed on unit-tests</h2><table><tr><td>Start Time</td><td>2016/07/17 11:54:11 EEST</td></tr><tr><td>End Time</td><td>2016/07/17 11:54:16 EEST</td></tr><tr><td>Duration</td><td>5 sec</td></tr><tr><td>Status</td><td>FAILED</td></tr></table><a href="http://localhost:8081/executor?execid=-1">mail-creator-test Execution Link</a><h3>Reason</h3><ul><li><a href="http://localhost:8081/executor?execid=-1&job=test-job">Failed job 'test-job' Link</a></li></ul>
diff --git a/azkaban-common/src/test/resources/azkaban/executor/mail/firstErrorMessage.html b/azkaban-common/src/test/resources/azkaban/executor/mail/firstErrorMessage.html
index 643b2ea..b47556a 100644
--- a/azkaban-common/src/test/resources/azkaban/executor/mail/firstErrorMessage.html
+++ b/azkaban-common/src/test/resources/azkaban/executor/mail/firstErrorMessage.html
@@ -1 +1 @@
-<h2 style="color:#FF0000"> Execution '-1' of flow 'mail-creator-test' has encountered a failure on unit-tests</h2>This flow is set to complete all currently running jobs before stopping.<table><tr><td>Start Time</td><td>2016/07/17 11:54:11 EEST</td></tr><tr><td>End Time</td><td>N/A</td></tr><tr><td>Duration</td><td>10 sec</td></tr><tr><td>Status</td><td>FAILED_FINISHING</td></tr></table><a href="http://localhost:8081/executor?execid=-1">mail-creator-test Execution Link</a><h3>Reason</h3><ul><li><a href="http://localhost:8081/executor?execid=-1&job=test-job">Failed job 'test-job' Link</a></li></ul>
+<h2 style="color:#FF0000"> Execution '-1' of flow 'mail-creator-test' of project 'test-project' has encountered a failure on unit-tests</h2>This flow is set to complete all currently running jobs before stopping.<table><tr><td>Start Time</td><td>2016/07/17 11:54:11 EEST</td></tr><tr><td>End Time</td><td>N/A</td></tr><tr><td>Duration</td><td>10 sec</td></tr><tr><td>Status</td><td>FAILED_FINISHING</td></tr></table><a href="http://localhost:8081/executor?execid=-1">mail-creator-test Execution Link</a><h3>Reason</h3><ul><li><a href="http://localhost:8081/executor?execid=-1&job=test-job">Failed job 'test-job' Link</a></li></ul>
diff --git a/azkaban-common/src/test/resources/azkaban/executor/mail/successEmail.html b/azkaban-common/src/test/resources/azkaban/executor/mail/successEmail.html
index 8b00fea..baec8f9 100644
--- a/azkaban-common/src/test/resources/azkaban/executor/mail/successEmail.html
+++ b/azkaban-common/src/test/resources/azkaban/executor/mail/successEmail.html
@@ -1 +1 @@
-<h2> Execution '-1' of flow 'mail-creator-test' has succeeded on unit-tests</h2><table><tr><td>Start Time</td><td>2016/07/17 11:54:11 EEST</td></tr><tr><td>End Time</td><td>2016/07/17 11:54:16 EEST</td></tr><tr><td>Duration</td><td>5 sec</td></tr><tr><td>Status</td><td>SUCCEEDED</td></tr></table><a href="http://localhost:8081/executor?execid=-1">mail-creator-test Execution Link</a>
+<h2> Execution '-1' of flow 'mail-creator-test' of project 'test-project' has succeeded on unit-tests</h2><table><tr><td>Start Time</td><td>2016/07/17 11:54:11 EEST</td></tr><tr><td>End Time</td><td>2016/07/17 11:54:16 EEST</td></tr><tr><td>Duration</td><td>5 sec</td></tr><tr><td>Status</td><td>SUCCEEDED</td></tr></table><a href="http://localhost:8081/executor?execid=-1">mail-creator-test Execution Link</a>
