Browse Source

Merge pull request #1608 from JinyLeeChina/dev

[fix] process instance alert bug #1595
pull/2/head
Tboy 5 years ago committed by GitHub
parent
commit
34b6537350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java

20
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java

@ -90,15 +90,15 @@ public class AlertManager {
* process instance format * process instance format
*/ */
private static final String PROCESS_INSTANCE_FORMAT = private static final String PROCESS_INSTANCE_FORMAT =
"\"Id:%d\"," + "\"id:%d\"," +
"\"Name:%s\"," + "\"name:%s\"," +
"\"Job type: %s\"," + "\"job type: %s\"," +
"\"State: %s\"," + "\"state: %s\"," +
"\"Recovery:%s\"," + "\"recovery:%s\"," +
"\"Run time: %d\"," + "\"run time: %d\"," +
"\"Start time: %s\"," + "\"start time: %s\"," +
"\"End time: %s\"," + "\"end time: %s\"," +
"\"Host: %s\"" ; "\"host: %s\"" ;
/** /**
* get process instance content * get process instance content
@ -234,7 +234,7 @@ public class AlertManager {
String cmdName = getCommandCnName(processInstance.getCommandType()); String cmdName = getCommandCnName(processInstance.getCommandType());
String success = processInstance.getState().typeIsSuccess() ? "success" :"failed"; String success = processInstance.getState().typeIsSuccess() ? "success" :"failed";
alert.setTitle(cmdName + success); alert.setTitle(cmdName + " " + success);
ShowType showType = processInstance.getState().typeIsSuccess() ? ShowType.TEXT : ShowType.TABLE; ShowType showType = processInstance.getState().typeIsSuccess() ? ShowType.TEXT : ShowType.TABLE;
alert.setShowType(showType); alert.setShowType(showType);
String content = getContentProcessInstance(processInstance, taskInstances); String content = getContentProcessInstance(processInstance, taskInstances);

Loading…
Cancel
Save