fix(core): filter flowWithException in SchedulerEndpoint (#4439)

kestra-io · Jul 26, 2024 · b63fc43 · b63fc43
1 parent 7c9a329
commit b63fc43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/io/kestra/core/endpoints/SchedulerEndpoint.java b/core/src/main/java/io/kestra/core/endpoints/SchedulerEndpoint.java
@@ -1,5 +1,6 @@
 package io.kestra.core.endpoints;
 
+import io.kestra.core.models.flows.FlowWithException;
 import io.kestra.core.models.triggers.AbstractTrigger;
 import io.kestra.core.models.triggers.Trigger;
 import io.kestra.core.schedulers.AbstractScheduler;
@@ -14,7 +15,6 @@
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Endpoint(id = "scheduler", defaultSensitive = false)
 @Requires(property = "kestra.server-type", pattern = "(SCHEDULER|STANDALONE)")
@@ -28,6 +28,7 @@ public SchedulerEndpointResult running() {
 
         List<SchedulerEndpointSchedule> result = scheduler.schedulerTriggers()
             .stream()
+            .filter(flowWithTriggers -> !(flowWithTriggers.getFlow() instanceof FlowWithException))
             .map(flowWithTrigger -> {
                 String uid = Trigger.uid(flowWithTrigger.getFlow(), flowWithTrigger.getAbstractTrigger());
 

diff --git a/core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java b/core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java
@@ -376,7 +376,7 @@ public List<FlowWithTriggers> schedulerTriggers() {
             .map(trigger ->
                 new FlowWithTriggers(
                     flows.get(trigger.flowUid()),
-                    flows.get(trigger.flowUid()).getTriggers().stream().filter(t -> t.getId().equals(trigger.getTriggerId())).findFirst().orElse(null),
+                    ListUtils.emptyOnNull(flows.get(trigger.flowUid()).getTriggers()).stream().filter(t -> t.getId().equals(trigger.getTriggerId())).findFirst().orElse(null),
                     trigger,
                     null,
                     null