gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(1.5.0-beta1): 优化重试客户端日志

Browse Source
This commit is contained in:
opensnail 2025-04-11 23:22:51 +08:00
parent df80d2eab9
commit 0ad2cbd162
4 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/executor/RemoteRetryExecutor.java
View File

@ -44,7 +44,7 @@ public class RemoteRetryExecutor {
executeRespDto.setSceneName(context.getScene());
try {
RetrySiteSnapshot.setAttemptNumber(context.getRetryCount());
// RetrySiteSnapshot.setAttemptNumber(context.getRetryCount() + 1);
// 初始化实时日志上下文
initLogContext(context);
@ -70,18 +70,20 @@ public class RemoteRetryExecutor {
executeRespDto.setResultJson(JsonUtil.toJsonString(retryerResultContext.getResult()));
}
Integer retryCount = context.getRetryCount() + 1;
if (Objects.equals(RetryResultStatusEnum.SUCCESS.getStatus(), executeRespDto.getStatusCode())) {
SnailJobLog.REMOTE.info("remote retry【SUCCESS】. count:[{}] result:[{}]", context.getRetryCount(),
executeRespDto.getResultJson());
SnailJobLog.REMOTE.info("remote retry【SUCCESS】. retryTaskId:[{}] count:[{}] result:[{}]",
context.getRetryTaskId(), retryCount, executeRespDto.getResultJson());
} else if (Objects.equals(RetryResultStatusEnum.STOP.getStatus(), executeRespDto.getStatusCode())) {
SnailJobLog.REMOTE.warn("remote retry 【STOP】. count:[{}] exceptionMsg:[{}]",
context.getRetryCount(), executeRespDto.getExceptionMsg());
SnailJobLog.REMOTE.warn("remote retry 【STOP】.retryTaskId:[{}] count:[{}] exceptionMsg:[{}]",
context.getRetryTaskId(), retryCount, executeRespDto.getExceptionMsg());
} else if (Objects.equals(RetryResultStatusEnum.FAILURE.getStatus(), executeRespDto.getStatusCode())) {
SnailJobLog.REMOTE.error("remote retry 【FAILURE】. count:[{}] ", context.getRetryCount(),
retryerResultContext.getThrowable());
SnailJobLog.REMOTE.error("remote retry 【FAILURE】. retryTaskId:[{}] count:[{}] ",
context.getRetryTaskId(), retryCount, retryerResultContext.getThrowable());
} else {
SnailJobLog.REMOTE.error("remote retry 【UNKNOWN】. count:[{}] result:[{}]", context.getRetryCount(),
executeRespDto.getResultJson(), retryerResultContext.getThrowable());
SnailJobLog.REMOTE.error("remote retry 【UNKNOWN】. retryTaskId:[{}] count:[{}] result:[{}]",
context.getRetryTaskId(), retryCount, executeRespDto.getResultJson(),
retryerResultContext.getThrowable());
}
} finally {

14
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/RetrySiteSnapshot.java
View File

@ -50,19 +50,6 @@ public class RetrySiteSnapshot {
* 进入方法入口时间标记
*/
private static final RetrySiteSnapshotContext<Long> ENTRY_METHOD_TIME = SnailRetrySpiLoader.loadRetrySiteSnapshotContext();
private static final RetrySiteSnapshotContext<Integer> ATTEMPT_NUMBER = SnailRetrySpiLoader.loadRetrySiteSnapshotContext();
public static Integer getAttemptNumber() {
return ATTEMPT_NUMBER.get();
}
public static void setAttemptNumber(Integer attemptNumber) {
ATTEMPT_NUMBER.set(attemptNumber);
}
public static void removeAttemptNumber() {
ATTEMPT_NUMBER.remove();
}
public static Integer getStage() {
return RETRY_STAGE.get();
@ -214,7 +201,6 @@ public class RetrySiteSnapshot {
removeStatus();
removeStage();
removeAttemptNumber();
removeEntryMethodTime();
removeRetryHeader();
removeRetryStatusCode();

17
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/strategy/RemoteRetryStrategies.java
View File

@ -86,7 +86,7 @@ public class RemoteRetryStrategies extends AbstractRetryStrategies {
@Override
protected RetryExecutorParameter<WaitStrategy, StopStrategy> getRetryExecutorParameter(RetryerInfo retryerInfo) {
return new RetryExecutorParameter<WaitStrategy, StopStrategy>() {
return new RetryExecutorParameter<>() {
@Override
public WaitStrategy backOff() {
@ -100,20 +100,7 @@ public class RemoteRetryStrategies extends AbstractRetryStrategies {
@Override
public List<RetryListener> getRetryListeners() {
return Collections.singletonList(new RetryListener() {
@Override
public <V> void onRetry(Attempt<V> attempt) {
Integer attemptNumber = RetrySiteSnapshot.getAttemptNumber();
if (attempt.hasResult()) {
SnailJobLog.LOCAL.info("snail-job 远程重试成功，第[{}]次调度", attemptNumber);
}
if (attempt.hasException()) {
SnailJobLog.LOCAL.error("snail-job 远程重试失败，第[{}]次调度 ", attemptNumber, attempt.getExceptionCause());
}
}
});
return Collections.emptyList();
}
};
}

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/timer/RetryTimerWheel.java
View File

@ -54,7 +54,7 @@ public class RetryTimerWheel {
public static synchronized void register(String idempotentKey, TimerTask<String> task, Duration delay) {
register(idempotentKey, hashedWheelTimer -> {
SnailJobLog.LOCAL.info("加入时间轮. delay:[{}ms] taskType:[{}]", delay, idempotentKey);
SnailJobLog.LOCAL.debug("加入时间轮. delay:[{}ms] taskType:[{}]", delay, idempotentKey);
timer.newTimeout(task, Math.max(delay.toMillis(), 0), TimeUnit.MILLISECONDS);
});
}