You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/05/11 06:49:39 UTC
[incubator-dolphinscheduler] branch dev-1.3.0 updated: blank in
eamil and left font align #2648 (#2673)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 83ede10 blank in eamil and left font align #2648 (#2673)
83ede10 is described below
commit 83ede1037ead8c8cc237b66c996c59d0d2e388f5
Author: qiaozhanwei <qi...@outlook.com>
AuthorDate: Mon May 11 14:49:29 2020 +0800
blank in eamil and left font align #2648 (#2673)
* script variable has "processDefinitionId" is error #2664
* blank in eamil and left font align #2648
Co-authored-by: qiaozhanwei <qi...@analysys.com.cn>
---
.../alert/template/impl/DefaultHTMLTemplate.java | 18 ++----------------
.../dolphinscheduler/common/enums/ExecutionStatus.java | 2 +-
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java
index 79123a1..7039d7c 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/impl/DefaultHTMLTemplate.java
@@ -140,21 +140,7 @@ public class DefaultHTMLTemplate implements AlertTemplate {
checkNotNull(content);
String htmlTableThead = StringUtils.isEmpty(title) ? "" : String.format("<thead>%s</thead>\n",title);
- return "<html>\n" +
- " <head>\n" +
- " <title>dolphinscheduler</title>\n" +
- " <meta name='Keywords' content=''>\n" +
- " <meta name='Description' content=''>\n" +
- " <style type=\"text/css\">\n" +
- " table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}\n" +
- " table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;text-align: right;}\n" +
- " table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: right;}\n" +
- " </style>\n" +
- " </head>\n" +
- " <body style=\"margin:0;padding:0\">\n" +
- " <table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\">\n" + htmlTableThead + content +
- " </table>\n" +
- " </body>\n" +
- "</html>";
+ return "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title>dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type=\"text/css\">table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;b [...]
}
+
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
index 1c336c8..ce141d0 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
@@ -76,7 +76,7 @@ public enum ExecutionStatus {
* @return status
*/
public boolean typeIsFailure(){
- return this == FAILURE || this == NEED_FAULT_TOLERANCE;
+ return this == FAILURE || this == NEED_FAULT_TOLERANCE || this == KILL;
}
/**