diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/lock/UseCacheLockAspect.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/lock/UseCacheLockAspect.java index aed87933..11b4591c 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/lock/UseCacheLockAspect.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/lock/UseCacheLockAspect.java @@ -61,7 +61,8 @@ public class UseCacheLockAspect { if (timeCost > SLOW_THRESHOLD) { final SlowLockEvent slowLockEvent = new SlowLockEvent() - .setLocKType(useCacheLock.type()) + .setType(SlowLockEvent.Type.LOCAL) + .setLockType(useCacheLock.type()) .setLockKey(String.valueOf(key)) .setCallerService(method.getDeclaringClass().getSimpleName()) .setCallerMethod(method.getName()) diff --git a/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/lock/SlowLockEvent.java b/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/lock/SlowLockEvent.java index 16527214..9211c90b 100644 --- a/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/lock/SlowLockEvent.java +++ b/powerjob-server/powerjob-server-monitor/src/tech/powerjob/server/monitor/events/lock/SlowLockEvent.java @@ -15,12 +15,18 @@ import tech.powerjob.server.monitor.Event; @Accessors(chain = true) public class SlowLockEvent implements Event { - private String locKType; + private Type type; + private String lockType; private String lockKey; private String callerService; private String callerMethod; private long cost; + public enum Type { + LOCAL, + DB + } + @Override public String type() { return "MONITOR_LOGGER_SLOW_LOCK"; @@ -28,6 +34,6 @@ public class SlowLockEvent implements Event { @Override public String message() { - return SJ.MONITOR_JOINER.join(locKType, lockKey, callerService, callerMethod, cost); + return SJ.MONITOR_JOINER.join(type, lockType, lockKey, callerService, callerMethod, cost); } } diff --git a/powerjob-server/powerjob-server-starter/src/main/resources/logback-config/powerjob_monitor.xml b/powerjob-server/powerjob-server-starter/src/main/resources/logback-config/powerjob_monitor.xml index 397c29c8..c3a49f8e 100644 --- a/powerjob-server/powerjob-server-starter/src/main/resources/logback-config/powerjob_monitor.xml +++ b/powerjob-server/powerjob-server-starter/src/main/resources/logback-config/powerjob_monitor.xml @@ -6,7 +6,7 @@ - + ${MONITOR_LOG_PATH}/database.log @@ -29,6 +29,104 @@ - + + + + + ${MONITOR_LOG_PATH}/tt_status_report.log + + ${MONITOR_LOG_PATTERN} + UTF-8 + + + ${MONITOR_LOG_PATH}/tt_status_report.log.${ROTATE_PATTERN} + 3 + 500MB + 1500MB + + + + 512 + 0 + true + + + + + + + + + ${MONITOR_LOG_PATH}/worker_heartbeat.log + + ${MONITOR_LOG_PATTERN} + UTF-8 + + + ${MONITOR_LOG_PATH}/worker_heartbeat.log.${ROTATE_PATTERN} + 3 + 500MB + 1500MB + + + + 512 + 0 + true + + + + + + + + + + ${MONITOR_LOG_PATH}/worker_log_report.log + + ${MONITOR_LOG_PATTERN} + UTF-8 + + + ${MONITOR_LOG_PATH}/worker_log_report.log.${ROTATE_PATTERN} + 3 + 500MB + 1500MB + + + + 512 + 0 + true + + + + + + + + + + ${MONITOR_LOG_PATH}/lock.log + + ${MONITOR_LOG_PATTERN} + UTF-8 + + + ${MONITOR_LOG_PATH}/lock.log.${ROTATE_PATTERN} + 3 + 500MB + 1500MB + + + + 512 + 0 + true + + + + + \ No newline at end of file