Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 17:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: maintenance job missing type

Browse source
This commit is contained in:
Christy Jacob 2025-01-17 22:53:31 +05:30
parent b81e15f5d4
commit e4efaf1efa
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env
View file

@ -79,7 +79,7 @@ _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
_APP_EXECUTOR_SECRET=your-secret-key _APP_EXECUTOR_SECRET=your-secret-key
_APP_EXECUTOR_HOST=http://proxy/v1 _APP_EXECUTOR_HOST=http://proxy/v1
_APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
_APP_MAINTENANCE_INTERVAL=86400 _APP_MAINTENANCE_INTERVAL=60
_APP_MAINTENANCE_DELAY= _APP_MAINTENANCE_DELAY=
_APP_MAINTENANCE_RETENTION_CACHE=2592000 _APP_MAINTENANCE_RETENTION_CACHE=2592000
_APP_MAINTENANCE_RETENTION_EXECUTION=1209600 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600

17
src/Appwrite/Platform/Tasks/Maintenance.php
View file

@ -47,9 +47,12 @@ class Maintenance extends Action
Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds"); Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
$this->foreachProject($dbForPlatform, function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) { $this->foreachProject($dbForPlatform, function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
$queueForDeletes->setProject($project); $queueForDeletes
->setType(DELETE_TYPE_MAINTENANCE)
->setProject($project)
->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
->trigger();
$this->notifyProjects($queueForDeletes, $usageStatsRetentionHourly);
}); });
$this->notifyDeleteConnections($queueForDeletes); $this->notifyDeleteConnections($queueForDeletes);
@ -59,16 +62,6 @@ class Maintenance extends Action
}, $interval, $delay); }, $interval, $delay);
} }
/**
* Hook to allow sub-classes to extend project-level maintenance functionality.
*/
protected function notifyProjects(Delete $queueForDeletes, int $usageStatsRetentionHourly): void
{
$queueForDeletes
->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
->trigger();
}
protected function foreachProject(Database $dbForPlatform, callable $callback): void protected function foreachProject(Database $dbForPlatform, callable $callback): void
{ {
// TODO: @Meldiron name of this method no longer matches. It does not delete, and it gives whole document // TODO: @Meldiron name of this method no longer matches. It does not delete, and it gives whole document

3
src/Appwrite/Platform/Workers/Deletes.php
View file

@ -83,6 +83,9 @@ class Deletes extends Action
$log->addTag('projectId', $project->getId()); $log->addTag('projectId', $project->getId());
$log->addTag('type', $type); $log->addTag('type', $type);
var_dump("--------------------------------");
var_dump($type);
switch (\strval($type)) { switch (\strval($type)) {
case DELETE_TYPE_DOCUMENT: case DELETE_TYPE_DOCUMENT:
switch ($document->getCollection()) { switch ($document->getCollection()) {