From 4853e0803ce19b7f2bcdf7b27ebae8febf2c5460 Mon Sep 17 00:00:00 2001
From: Fabian Gruber <1951610+basert@users.noreply.github.com>
Date: Tue, 13 May 2025 14:05:13 +0200
Subject: [PATCH] fix(schedules): better error handling (#9751)

---
 src/Appwrite/Platform/Tasks/ScheduleBase.php      | 13 +++++++++----
 src/Appwrite/Platform/Tasks/ScheduleFunctions.php |  8 +++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Appwrite/Platform/Tasks/ScheduleBase.php b/src/Appwrite/Platform/Tasks/ScheduleBase.php
index d9de41ea64..afd7d9d22a 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleBase.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleBase.php
@@ -91,13 +91,18 @@ abstract class ScheduleBase extends Action
         });
 
         while (true) {
-            $this->enqueueResources($pools, $dbForPlatform, $getProjectDB);
-            $this->scheduleTelemetryCount->record(count($this->schedules), ['resourceType' => static::getSupportedResource()]);
-            sleep(static::ENQUEUE_TIMER);
+            try {
+                go(fn () => $this->enqueueResources($pools, $dbForPlatform, $getProjectDB));
+                $this->scheduleTelemetryCount->record(count($this->schedules), ['resourceType' => static::getSupportedResource()]);
+                sleep(static::ENQUEUE_TIMER);
+            } catch (\Throwable $th) {
+                Console::error('Failed to enqueue resources: ' . $th->getMessage());
+            }
+
         }
     }
 
-    private function collectSchedules(Group $pools, Database $dbForPlatform, callable $getProjectDB, ?string &$lastSyncUpdate): void
+    private function collectSchedules(Group $pools, Database $dbForPlatform, callable $getProjectDB, string &$lastSyncUpdate): void
     {
         // If we haven't synced yet, load all active schedules
         $initialLoad = $lastSyncUpdate === "0";
diff --git a/src/Appwrite/Platform/Tasks/ScheduleFunctions.php b/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
index 689ba831b8..6788748f3d 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
@@ -46,7 +46,13 @@ class ScheduleFunctions extends ScheduleBase
         $delayedExecutions = []; // Group executions with same delay to share one coroutine
 
         foreach ($this->schedules as $key => $schedule) {
-            $cron = new CronExpression($schedule['schedule']);
+            try {
+                $cron = new CronExpression($schedule['schedule']);
+            } catch (\InvalidArgumentException) {
+                // ignore invalid cron expressions
+                continue;
+            }
+
             $nextDate = $cron->getNextRunDate();
             $next = DateTime::format($nextDate);