diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java index 1dbd93d6d..2c7a4f033 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java @@ -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)) { diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java index de0d5e410..0d3b029a8 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java @@ -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; } } diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java index 47c044d40..8c74d24a1 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterRPCInvokeMQConfiguration.java @@ -107,7 +107,9 @@ public class StarterRPCInvokeMQConfiguration { private BiConsumer> 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> 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> 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); diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java index cf4ba4f3d..4606476f1 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java @@ -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(); diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java index bcb377b77..81e7c81d2 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java @@ -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() { diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java index a949514d9..e3a911ef4 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterDecoder.java @@ -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) { diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterInvocationHandler.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterInvocationHandler.java index 3f20ac432..bcc0d8e43 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterInvocationHandler.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/WorkflowEngineStarterInvocationHandler.java @@ -61,8 +61,10 @@ class WorkflowEngineStarterInvocationHandler implements InvocationHandler { stopWatch.stop(); List 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; diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/FailOverInterceptor.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/FailOverInterceptor.java index 0eb2659fc..a019b6e56 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/FailOverInterceptor.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/FailOverInterceptor.java @@ -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; } diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/LogInterceptor.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/LogInterceptor.java index 1ff75e8ad..7eb43810c 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/LogInterceptor.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/handler/execute/interceptor/LogInterceptor.java @@ -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); diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/broadcast/consumer/AbstractInnerWorkflowListener.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/broadcast/consumer/AbstractInnerWorkflowListener.java index 97a3faca4..cb2dbeb27 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/broadcast/consumer/AbstractInnerWorkflowListener.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/broadcast/consumer/AbstractInnerWorkflowListener.java @@ -59,7 +59,9 @@ public abstract class AbstractInnerWorkflowListener