Use schedule ID as unique memory cache key

This commit is contained in:
Matej Bačo 2024-09-07 17:31:17 +00:00
parent 0533792b00
commit 3aa2bd6aa3
3 changed files with 7 additions and 6 deletions

View file

@ -74,6 +74,7 @@ abstract class ScheduleBase extends Action
); );
return [ return [
'$internalId' => $schedule->getInternalId(),
'$id' => $schedule->getId(), '$id' => $schedule->getId(),
'resourceId' => $schedule->getAttribute('resourceId'), 'resourceId' => $schedule->getAttribute('resourceId'),
'schedule' => $schedule->getAttribute('schedule'), 'schedule' => $schedule->getAttribute('schedule'),
@ -110,7 +111,7 @@ abstract class ScheduleBase extends Action
foreach ($results as $document) { foreach ($results as $document) {
try { try {
$this->schedules[$document['resourceId']] = $getSchedule($document); $this->schedules[$document->getInternalId()] = $getSchedule($document);
} catch (\Throwable $th) { } catch (\Throwable $th) {
$collectionId = match ($document->getAttribute('resourceType')) { $collectionId = match ($document->getAttribute('resourceType')) {
'function' => 'functions', 'function' => 'functions',
@ -172,10 +173,10 @@ abstract class ScheduleBase extends Action
if (!$document['active']) { if (!$document['active']) {
Console::info("Removing: {$document['resourceId']}"); Console::info("Removing: {$document['resourceId']}");
unset($this->schedules[$document['resourceId']]); unset($this->schedules[$document->getInternalId()]);
} elseif ($new !== $org) { } elseif ($new !== $org) {
Console::info("Updating: {$document['resourceId']}"); Console::info("Updating: {$document['resourceId']}");
$this->schedules[$document['resourceId']] = $getSchedule($document); $this->schedules[$document->getInternalId()] = $getSchedule($document);
} }
} }

View file

@ -36,7 +36,7 @@ class ScheduleExecutions extends ScheduleBase
$schedule['$id'], $schedule['$id'],
); );
unset($this->schedules[$schedule['resourceId']]); unset($this->schedules[$schedule['$internalId']]);
continue; continue;
} }
@ -70,7 +70,7 @@ class ScheduleExecutions extends ScheduleBase
$schedule['$id'], $schedule['$id'],
); );
unset($this->schedules[$schedule['resourceId']]); unset($this->schedules[$schedule['$internalId']]);
} }
$queue->reclaim(); $queue->reclaim();

View file

@ -53,7 +53,7 @@ class ScheduleMessages extends ScheduleBase
$queue->reclaim(); $queue->reclaim();
unset($this->schedules[$schedule['resourceId']]); unset($this->schedules[$schedule['$internalId']]);
}); });
} }
} }