mirror of
https://github.com/appwrite/appwrite
synced 2026-05-24 09:28:40 +00:00
Merge pull request #11010 from appwrite/update-schedule-functions
This commit is contained in:
commit
cdbd80ceda
13 changed files with 59 additions and 47 deletions
|
|
@ -945,18 +945,18 @@ App::get('/v1/health/queue/failed/:name')
|
||||||
contentType: ContentType::JSON
|
contentType: ContentType::JSON
|
||||||
))
|
))
|
||||||
->param('name', '', new WhiteList([
|
->param('name', '', new WhiteList([
|
||||||
Event::DATABASE_QUEUE_NAME,
|
System::getEnv('_APP_DATABASE_QUEUE_NAME', Event::DATABASE_QUEUE_NAME),
|
||||||
Event::DELETE_QUEUE_NAME,
|
System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME),
|
||||||
Event::AUDITS_QUEUE_NAME,
|
System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME),
|
||||||
Event::MAILS_QUEUE_NAME,
|
System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME),
|
||||||
Event::FUNCTIONS_QUEUE_NAME,
|
System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME),
|
||||||
Event::STATS_RESOURCES_QUEUE_NAME,
|
System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME),
|
||||||
Event::STATS_USAGE_QUEUE_NAME,
|
System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME),
|
||||||
Event::WEBHOOK_QUEUE_NAME,
|
System::getEnv('_APP_WEBHOOK_QUEUE_NAME', Event::WEBHOOK_QUEUE_NAME),
|
||||||
Event::CERTIFICATES_QUEUE_NAME,
|
System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME),
|
||||||
Event::BUILDS_QUEUE_NAME,
|
System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME),
|
||||||
Event::MESSAGING_QUEUE_NAME,
|
System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME),
|
||||||
Event::MIGRATIONS_QUEUE_NAME
|
System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME)
|
||||||
]), 'The name of the queue')
|
]), 'The name of the queue')
|
||||||
->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
|
->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
|
||||||
->inject('response')
|
->inject('response')
|
||||||
|
|
@ -993,18 +993,18 @@ App::get('/v1/health/queue/failed/:name')
|
||||||
|
|
||||||
/** @var Event $queue */
|
/** @var Event $queue */
|
||||||
$queue = match ($name) {
|
$queue = match ($name) {
|
||||||
Event::DATABASE_QUEUE_NAME => $queueForDatabase,
|
System::getEnv('_APP_DATABASE_QUEUE_NAME', Event::DATABASE_QUEUE_NAME) => $queueForDatabase,
|
||||||
Event::DELETE_QUEUE_NAME => $queueForDeletes,
|
System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME) => $queueForDeletes,
|
||||||
Event::AUDITS_QUEUE_NAME => $queueForAudits,
|
System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME) => $queueForAudits,
|
||||||
Event::MAILS_QUEUE_NAME => $queueForMails,
|
System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME) => $queueForMails,
|
||||||
Event::FUNCTIONS_QUEUE_NAME => $queueForFunctions,
|
System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME) => $queueForFunctions,
|
||||||
Event::STATS_RESOURCES_QUEUE_NAME => $queueForStatsResources,
|
System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME) => $queueForStatsResources,
|
||||||
Event::STATS_USAGE_QUEUE_NAME => $queueForStatsUsage,
|
System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME) => $queueForStatsUsage,
|
||||||
Event::WEBHOOK_QUEUE_NAME => $queueForWebhooks,
|
System::getEnv('_APP_WEBHOOK_QUEUE_NAME', Event::WEBHOOK_QUEUE_NAME) => $queueForWebhooks,
|
||||||
Event::CERTIFICATES_QUEUE_NAME => $queueForCertificates,
|
System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME) => $queueForCertificates,
|
||||||
Event::BUILDS_QUEUE_NAME => $queueForBuilds,
|
System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME) => $queueForBuilds,
|
||||||
Event::MESSAGING_QUEUE_NAME => $queueForMessaging,
|
System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME) => $queueForMessaging,
|
||||||
Event::MIGRATIONS_QUEUE_NAME => $queueForMigrations,
|
System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME) => $queueForMigrations,
|
||||||
};
|
};
|
||||||
$failed = $queue->getSize(failed: true);
|
$failed = $queue->getSize(failed: true);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Appwrite\Event;
|
namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Audit extends Event
|
class Audit extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -19,8 +20,8 @@ class Audit extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::AUDITS_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME))
|
||||||
->setClass(Event::AUDITS_CLASS_NAME);
|
->setClass(System::getEnv('_APP_AUDITS_CLASS_NAME', Event::AUDITS_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ namespace Appwrite\Event;
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Build extends Event
|
class Build extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -18,8 +19,8 @@ class Build extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::BUILDS_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME))
|
||||||
->setClass(Event::BUILDS_CLASS_NAME);
|
->setClass(System::getEnv('_APP_BUILDS_CLASS_NAME', Event::BUILDS_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Certificate extends Event
|
class Certificate extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -16,8 +17,8 @@ class Certificate extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::CERTIFICATES_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME))
|
||||||
->setClass(Event::CERTIFICATES_CLASS_NAME);
|
->setClass(System::getEnv('_APP_CERTIFICATES_CLASS_NAME', Event::CERTIFICATES_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ namespace Appwrite\Event;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\DSN\DSN;
|
use Utopia\DSN\DSN;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Database extends Event
|
class Database extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -24,7 +25,7 @@ class Database extends Event
|
||||||
{
|
{
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this->setClass(Event::DATABASE_CLASS_NAME);
|
$this->setClass(System::getEnv('_APP_DATABASE_CLASS_NAME', Event::DATABASE_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Delete extends Event
|
class Delete extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -20,8 +21,8 @@ class Delete extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::DELETE_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
|
||||||
->setClass(Event::DELETE_CLASS_NAME);
|
->setClass(System::getEnv('_APP_DELETE_CLASS_NAME', Event::DELETE_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ namespace Appwrite\Event;
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Func extends Event
|
class Func extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -25,8 +26,8 @@ class Func extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::FUNCTIONS_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME))
|
||||||
->setClass(Event::FUNCTIONS_CLASS_NAME);
|
->setClass(System::getEnv('_APP_FUNCTIONS_CLASS_NAME', Event::FUNCTIONS_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Mail extends Event
|
class Mail extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -24,8 +25,8 @@ class Mail extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::MAILS_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME))
|
||||||
->setClass(Event::MAILS_CLASS_NAME);
|
->setClass(System::getEnv('_APP_MAILS_CLASS_NAME', Event::MAILS_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Messaging extends Event
|
class Messaging extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -19,8 +20,8 @@ class Messaging extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::MESSAGING_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME))
|
||||||
->setClass(Event::MESSAGING_CLASS_NAME);
|
->setClass(System::getEnv('_APP_MESSAGING_CLASS_NAME', Event::MESSAGING_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ namespace Appwrite\Event;
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Migration extends Event
|
class Migration extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -16,8 +17,8 @@ class Migration extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::MIGRATIONS_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME))
|
||||||
->setClass(Event::MIGRATIONS_CLASS_NAME);
|
->setClass(System::getEnv('_APP_MIGRATIONS_CLASS_NAME', Event::MIGRATIONS_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Appwrite\Event;
|
namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class StatsResources extends Event
|
class StatsResources extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -13,8 +14,8 @@ class StatsResources extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::STATS_RESOURCES_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME))
|
||||||
->setClass(Event::STATS_RESOURCES_CLASS_NAME);
|
->setClass(System::getEnv('_APP_STATS_RESOURCES_CLASS_NAME', Event::STATS_RESOURCES_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class StatsUsage extends Event
|
class StatsUsage extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -18,8 +19,8 @@ class StatsUsage extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::STATS_USAGE_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
|
||||||
->setClass(Event::STATS_USAGE_CLASS_NAME);
|
->setClass(System::getEnv('_APP_STATS_USAGE_CLASS_NAME', Event::STATS_USAGE_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Appwrite\Event;
|
namespace Appwrite\Event;
|
||||||
|
|
||||||
use Utopia\Queue\Publisher;
|
use Utopia\Queue\Publisher;
|
||||||
|
use Utopia\System\System;
|
||||||
|
|
||||||
class Webhook extends Event
|
class Webhook extends Event
|
||||||
{
|
{
|
||||||
|
|
@ -11,8 +12,8 @@ class Webhook extends Event
|
||||||
parent::__construct($publisher);
|
parent::__construct($publisher);
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->setQueue(Event::WEBHOOK_QUEUE_NAME)
|
->setQueue(System::getEnv('_APP_WEBHOOK_QUEUE_NAME', Event::WEBHOOK_QUEUE_NAME))
|
||||||
->setClass(Event::WEBHOOK_CLASS_NAME);
|
->setClass(System::getEnv('_APP_WEBHOOK_CLASS_NAME', Event::WEBHOOK_CLASS_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue