wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req

Browse Source 
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java
This commit is contained in:
wangli 2024-05-27 19:47:00 +08:00
commit 6f4caf6b11
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java
View File

@ -65,7 +65,7 @@ public class ErrorReportAspect implements Ordered {
watch.start(signature.toShortString()); watch.start(signature.toShortString());
Object result = joinPoint.proceed(); Object result = joinPoint.proceed();
watch.stop(); watch.stop();
log.info("StopWatch '" + watch.getLastTaskName() + "': running time = " + watch.getTotalTimeSeconds() + " s"); log.info("StopWatch '{}': running time = {} 's", watch.getLastTaskName(), watch.getTotalTimeSeconds());
if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) { if (!signature.toShortString().contains("ExtAxApiLogServiceImpl")) {
String type = getType(joinPoint); String type = getType(joinPoint);

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java
View File

@ -115,7 +115,7 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign
ApiResult<T> result = supplier.get(); ApiResult<T> result = supplier.get();
stopWatch.stop(); stopWatch.stop();
log.info("{}-Cost:{}, Result: {}", operatorDesc, log.info("{}-Cost:{}, Result: {}", operatorDesc,
"API StopWatch '" + stopWatch.getId() + "': running time = " + stopWatch.getTotalTimeSeconds() + " s", "API StopWatch '" + stopWatch.getId() + "': running time = " + stopWatch.getTotalTimeSeconds() + " 's",
JSONUtil.toJsonStr(result)); JSONUtil.toJsonStr(result));
try { try {
if (stopWatch.getTotalTimeSeconds() > executionStartListener.getApiTimeout()) { if (stopWatch.getTotalTimeSeconds() > executionStartListener.getApiTimeout()) {

4
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/error/ErrorReporterEventListener.java
View File

@ -50,7 +50,9 @@ public class ErrorReporterEventListener implements BpmnAsyncJobEventListener {
} else if (Lists.newArrayList("live", "master").contains(profile)) { } else if (Lists.newArrayList("live", "master").contains(profile)) {
reporterType = ReporterType.ONLY_LOG; reporterType = ReporterType.ONLY_LOG;
} }
reporterType.executeAction(profile, "异步任务执行异常, 剩余重试次数:" + job.getRetries(), sendDingTalk, new Object[]{job}, "act_ru_job", throwable, false); if (job.getRetries() <= 1) {
reporterType.executeAction(profile, "异步任务执行异常, 重试 3 次后仍未成功", sendDingTalk, new Object[]{job}, "act_ru_job", throwable, false);
}
} }
@Override @Override