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

Merge remote-tracking branch 'origin/master' into feature/merge_2924_2752

Browse Source
This commit is contained in:
wangli 2024-10-30 13:48:59 +08:00
commit a394c8a690
10 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,9 @@ public class ErrorReportAspect implements Ordered {
*/
@AfterThrowing(pointcut = "@within(errorReporter) && @annotation(operation)", throwing = "e", argNames = "joinPoint,errorReporter,operation,e")
public void doAfterThrowing(JoinPoint joinPoint, ErrorReporter errorReporter, Operation operation, Exception e) {
log.info("ErrorReportAspect 记录异常信息: {}", e.getMessage());
if(log.isDebugEnabled()) {
log.debug("ErrorReportAspect 记录异常信息: {}", e.getMessage());
}
EnvConfig[] envConfigs = errorReporter.envConfig();
for (EnvConfig envConfig : envConfigs) {
if (Arrays.asList(envConfig.profiles()).contains(profile)) {

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
View File

@ -110,7 +110,9 @@ public class StarterBroadcastMQConfiguration {
// 处理 properties 配置进行事件过滤
for (InnerMessageQueueHandleBeforeFilter filter : filters) {
if (filter.doFilter(message)) {
log.info("【{}】message has been filtered, messageId: {}", this.getClass().getSimpleName(), message.getMsgId());
if (log.isDebugEnabled()) {
log.debug("【{}】message has been filtered, messageId: {}", this.getClass().getSimpleName(), message.getMsgId());
}
return;
}
}

20
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java
View File

@ -107,7 +107,9 @@ public class StarterRPCInvokeMQConfiguration {
private BiConsumer<Event, EventProducer.Context<RocketMQEventProducer.RocketMQMessageMeta>> getSendBeforeCallback() {
return (event, context) -> {
event.setEventId(IdHelper.get32UUID());
log.info("mq_send_Before: {}, uniqueId: {}", event.getShardingKey(), event.getEventId());
if (log.isDebugEnabled()) {
log.debug("mq_send_Before: {}, uniqueId: {}", event.getShardingKey(), event.getEventId());
}
};
}
@ -121,7 +123,9 @@ public class StarterRPCInvokeMQConfiguration {
private BiConsumer<Event, EventProducer.Context<RocketMQEventProducer.RocketMQMessageMeta>> getSendAfterCallback() {
return (event, context) -> {
String messageId = context.getHeaders().get(MQ_MESSAGE_ID);
log.info("mq_send_after: {}, uniqueId: {}, messageId: {}", event.getShardingKey(), event.getEventId(), messageId);
if (log.isDebugEnabled()) {
log.debug("mq_send_after: {}, uniqueId: {}, messageId: {}", event.getShardingKey(), event.getEventId(), messageId);
}
};
}
@ -134,7 +138,9 @@ public class StarterRPCInvokeMQConfiguration {
*/
private BiConsumer<Event, EventProducer.Context<RocketMQEventProducer.RocketMQMessageMeta>> getTransactionRollbackHandler() {
return (event, context) -> {
log.info("mq_transaction_rollback: {}, uniqueId: {}", event.getShardingKey(), event.getEventId());
if (log.isDebugEnabled()) {
log.debug("mq_transaction_rollback: {}, uniqueId: {}", event.getShardingKey(), event.getEventId());
}
};
}
@ -156,7 +162,9 @@ public class StarterRPCInvokeMQConfiguration {
if (eventWrapper.isHandled()) {
// 只收集被App真正消费的消息.
Event event = eventWrapper.getEvent();
log.info("WorkflowEngineStarter RPC MQ, handled event: {}", event.toPrettyJsonString());
if (log.isDebugEnabled()) {
log.debug("WorkflowEngineStarter RPC MQ, handled event: {}", event.toPrettyJsonString());
}
}
};
return new DefaultEventConsumer(applicationName + MODULE_NAME_SUFFIX, workflowEngineStarterEventHandlerRepository, callback);
@ -185,7 +193,9 @@ public class StarterRPCInvokeMQConfiguration {
@Override
public void onMessage(MessageExt message) {
if (filter.doFilter(message)) {
log.info("【{}】message has been filtered, messageId: {}", this.getClass().getSimpleName(), message.getMsgId());
if (log.isDebugEnabled()) {
log.debug("【{}】message has been filtered, messageId: {}", this.getClass().getSimpleName(), message.getMsgId());
}
return;
}
super.onEvent(message, workflowEngineStarterEventConsumer);

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java
View File

@ -104,7 +104,9 @@ public class WorkflowEngineStarterAutoConfiguration {
private ExecuteInterceptor getFailInterceptor(WorkflowEngineStarterProperties starterProperties) {
BroadcastListenerProperties listenerRetry = starterProperties.getBroadcast();
FailHandleTypeEnum failHandleType = listenerRetry.getFailHandleType();
log.info("workflow engine starter fail handle type : {}", failHandleType);
if (log.isDebugEnabled()) {
log.debug("workflow engine starter fail handle type : {}", failHandleType);
}
switch (failHandleType) {
case FAIL_BACK:
// return new FailBackInterceptor();

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java
View File

@ -244,8 +244,8 @@ public class ComplexInvokeClient implements Client {
// at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
// at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:753)
// 只设置为字符串会报错，恢复为设置成CommonResponse
final ByteArrayInputStream inputStream = new ByteArrayInputStream(JSON.toJSONString(CommonResponse.success(HttpStatus.OK.value(), "Send MQ Success", null))
.getBytes(UTF_8));
final ByteArrayInputStream inputStream = new ByteArrayInputStream(JSON.toJSONString(CommonResponse.success(HttpStatus.OK.value(), null, null))
.getBytes(UTF_8));
@Override
public Integer length() {

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java
View File

@ -72,7 +72,9 @@ final class WorkflowEngineStarterDecoder implements Decoder {
wrappedType = ParameterizedTypeImpl.make(CommonResponse.class, new Type[]{type}, null);
}
Object decode = delegate.decode(response, wrappedType);
log.info("workflow engine starter response :{}", JSON.toJSONString(decode));
if (log.isDebugEnabled()) {
log.debug("workflow engine starter response :{}", JSON.toJSONString(decode));
}
if (decode instanceof CommonResponse) {
CommonResponse<?> commonResponse = (CommonResponse<?>) decode;
if (response.status() == 202) {

6
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterInvocationHandler.java
View File

@ -61,8 +61,10 @@ class WorkflowEngineStarterInvocationHandler implements InvocationHandler {
stopWatch.stop();
List<String> ignoreMethods = Lists.newArrayList("sync", "async");
if (!ignoreMethods.contains(method.getName())) {
log.info("Workflow starter Method invoke record: {}.{}, args: {}, result: {} const: {} ms",
target.type().getSimpleName(), method.getName(), JSON.toJSONString(args), JSON.toJSONString(invoke), stopWatch.getTotalTimeMillis());
if (log.isDebugEnabled()) {
log.debug("Workflow starter Method invoke record: {}.{}, args: {}, result: {} const: {} ms",
target.type().getSimpleName(), method.getName(), JSON.toJSONString(args), JSON.toJSONString(invoke), stopWatch.getTotalTimeMillis());
}
}
}
return invoke;

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/FailOverInterceptor.java
View File

@ -35,7 +35,9 @@ public final class FailOverInterceptor extends AbstractListenerInterceptor {
int failedAttempts = 0;
do {
if (failedAttempts > 0) {
log.info("Waiting for {} ms before retrying the command. retryTimes: {}", waitTime, failedAttempts);
if (log.isDebugEnabled()) {
log.debug("Waiting for {} ms before retrying the command. retryTimes: {}", waitTime, failedAttempts);
}
waitBeforeRetry(waitTime);
waitTime *= waitIncreaseFactor;
}

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/LogInterceptor.java
View File

@ -21,8 +21,8 @@ public final class LogInterceptor extends AbstractListenerInterceptor {
if (log.isDebugEnabled()) {
log.debug("--- starting handle mq ---- ");
}
if (log.isInfoEnabled()) {
log.info("messageId: {}, eventCode: {}, messageBody: {}", context.getMsgId(), context.getEventCode().toString(), JSON.toJSONString(t));
if (log.isDebugEnabled()) {
log.debug("messageId: {}, eventCode: {}, messageBody: {}", context.getMsgId(), context.getEventCode().toString(), JSON.toJSONString(t));
}
try {
getNext().execute(executor, consumer, context, t);

4
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/broadcast/consumer/AbstractInnerWorkflowListener.java
View File

@ -59,7 +59,9 @@ public abstract class AbstractInnerWorkflowListener<H extends Ordered, F extends
if (!CollectionUtils.isEmpty(businessListeners)) {
for (F filter : businessFilters) {
if (filter.doFilter(event, context, convert)) {
log.info("【{}】filtered message, messageId: {}", filter.getClass().getSimpleName(), context.getMsgId());
if (log.isDebugEnabled()) {
log.debug("【{}】filtered message, messageId: {}", filter.getClass().getSimpleName(), context.getMsgId());
}
return;
}
}