Skip to content

Commit 4d34724

Browse files
committed
cleanup
1 parent b3f799f commit 4d34724

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,15 @@ public List<Future<TriggerKey>> triggerNextTasks(OffsetDateTime timeDue) {
126126
final var result = trx.execute(t -> {
127127
var triggers = triggerService.lockNextTrigger(name, taskExecutor.getFreeThreads(), timeDue);
128128
editSchedulerStatus.checkinToRegistry(name,
129-
taskExecutor.countRunning() + triggers.size(), taskExecutor.getMaxThreads());
129+
taskExecutor.countRunning() + triggers.size(),
130+
taskExecutor.getMaxThreads());
130131
return triggers;
131132
});
132133

133134
return taskExecutor.submit(result);
134135
} else {
135-
log.info("No free threads {}/{} right now to run jobs due for: {}",
136-
taskExecutor.getFreeThreads(),
136+
log.info("No free threads {}/{} right now to run jobs due={}",
137+
taskExecutor.countRunning(),
137138
taskExecutor.getMaxThreads(),
138139
timeDue);
139140
editSchedulerStatus.checkinToRegistry(name, taskExecutor.countRunning(), taskExecutor.getMaxThreads());

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/component/TaskExecutorComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void shutdown() {
143143
shutdownNow();
144144
}
145145
} else {
146-
log.info("Shutdown {} with.", schedulerName);
146+
log.info("Shutdown {}.", schedulerName);
147147
}
148148
} finally {
149149
executor = null;
@@ -210,7 +210,7 @@ public void setMaxThreads(int value) {
210210
}
211211

212212
public int getMaxThreads() {
213-
return isStopped() ? 0 : this.maxThreads.get();
213+
return this.maxThreads.get();
214214
}
215215

216216
public boolean isRunning(TriggerEntity trigger) {

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/RunTaskWithStateCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Optional<TriggerEntity> execute(EditTriggerComponent editTrigger) {
4343

4444
private Optional<TriggerEntity> runTask(EditTriggerComponent editTrigger) {
4545
editTrigger.triggerIsNowRunning(trigger, state);
46-
46+
4747
task.accept(state);
4848

4949
var result = editTrigger.completeTaskWithSuccess(trigger.getKey(), state);

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/TriggerEntity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ public TriggerEntity cancel(Exception e) {
7373
if (e == null) {
7474
this.data.setExceptionName("PersistentTask canceled");
7575
} else {
76-
data.setExceptionName(e.getClass().getName());
77-
data.setLastException(ExceptionUtils.getStackTrace(e));
76+
this.data.setExceptionName(e.getClass().getName());
77+
this.data.setLastException(ExceptionUtils.getStackTrace(e));
7878
}
7979

80-
data.updateRunningDuration();
80+
this.data.updateRunningDuration();
8181
return this;
8282
}
8383

0 commit comments

Comments
 (0)