Move listener for immediate-execution to builder

kagkarlsson · Jul 2, 2024 · 087425a · 087425a
1 parent 92189fa
commit 087425a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/...heduler/TriggerCheckForDueExecutions.java → ...duler/ImmediateCheckForDueExecutions.java b/...heduler/TriggerCheckForDueExecutions.java → ...duler/ImmediateCheckForDueExecutions.java
@@ -19,22 +19,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class TriggerCheckForDueExecutions extends AbstractSchedulerListener {
-  private static final Logger LOG = LoggerFactory.getLogger(TriggerCheckForDueExecutions.class);
-  private SchedulerState schedulerState;
+class ImmediateCheckForDueExecutions extends AbstractSchedulerListener {
+  private static final Logger LOG = LoggerFactory.getLogger(ImmediateCheckForDueExecutions.class);
+  private final Scheduler scheduler;
   private Clock clock;
-  private Waiter executeDueWaiter;
 
-  public TriggerCheckForDueExecutions(
-      SchedulerState schedulerState, Clock clock, Waiter executeDueWaiter) {
-    this.schedulerState = schedulerState;
+  public ImmediateCheckForDueExecutions(
+      Scheduler scheduler, Clock clock) {
+    this.scheduler = scheduler;
     this.clock = clock;
-    this.executeDueWaiter = executeDueWaiter;
   }
 
   @Override
   public void onExecutionScheduled(
       TaskInstanceId taskInstanceId, Instant scheduledToExecutionTime) {
+    SchedulerState schedulerState = scheduler.getSchedulerState();
     if (!schedulerState.isStarted() || schedulerState.isShuttingDown()) {
       LOG.debug(
           "Will not act on scheduling event for execution (task: '{}', id: '{}') as scheduler is starting or shutting down.",
@@ -48,7 +47,7 @@ public void onExecutionScheduled(
           "Task-instance scheduled to run directly, triggering check for due executions (unless it is already running). Task: {}, instance: {}",
           taskInstanceId.getTaskName(),
           taskInstanceId.getId());
-      executeDueWaiter.wakeOrSkipNextWait();
+      scheduler.triggerCheckForDueExecutions();
     }
   }
 }
diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/Scheduler.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/Scheduler.java
@@ -80,8 +80,7 @@ protected Scheduler(
       Waiter executeDueWaiter,
       Duration heartbeatInterval,
       int numberOfMissedHeartbeatsBeforeDead,
-      boolean enableImmediateExecution,
-      List<SchedulerListener> schedulerListeners,
+    List<SchedulerListener> schedulerListeners,
       PollingStrategyConfig pollingStrategyConfig,
       Duration deleteUnresolvedAfter,
       Duration shutdownMaxWait,
@@ -109,9 +108,6 @@ protected Scheduler(
     this.schedulerListeners = new SchedulerListeners(schedulerListeners);
     this.dueExecutor = dueExecutor;
     this.housekeeperExecutor = housekeeperExecutor;
-    if (enableImmediateExecution) {
-      this.schedulerListeners.add(new TriggerCheckForDueExecutions(schedulerState, clock, executeDueWaiter));
-    }
     delegate = new StandardSchedulerClient(clientTaskRepository, this.schedulerListeners, clock);
     this.failureLogger = ConfigurableLogger.create(LOG, logLevel, logStackTrace);
 

diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerBuilder.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/SchedulerBuilder.java
@@ -302,8 +302,7 @@ public Scheduler build() {
             waiter,
             heartbeatInterval,
             numberOfMissedHeartbeatsBeforeDead,
-            enableImmediateExecution,
-            schedulerListeners,
+          schedulerListeners,
             pollingStrategyConfig,
             deleteUnresolvedAfter,
             shutdownMaxWait,
@@ -313,6 +312,10 @@ public Scheduler build() {
             candidateDueExecutor,
             candidateHousekeeperExecutor);
 
+    if (enableImmediateExecution) {
+      scheduler.registerSchedulerListener(new ImmediateCheckForDueExecutions(scheduler, clock));
+    }
+
     if (registerShutdownHook) {
       Runtime.getRuntime()
           .addShutdownHook(

diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/testhelper/ManualScheduler.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/testhelper/ManualScheduler.java
@@ -59,8 +59,7 @@ public class ManualScheduler extends Scheduler {
         waiter,
         heartbeatInterval,
         SchedulerBuilder.DEFAULT_MISSED_HEARTBEATS_LIMIT,
-        executeImmediately,
-        schedulerListeners,
+      schedulerListeners,
         pollingStrategyConfig,
         deleteUnresolvedAfter,
         Duration.ZERO,