Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x
This commit is contained in:
commit
0a85809532
|
@ -693,6 +693,7 @@ App::error()
|
||||||
$publish = $error->getCode() === 0 || $error->getCode() >= 500;
|
$publish = $error->getCode() === 0 || $error->getCode() >= 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
if ($error->getCode() >= 400 && $error->getCode() < 500) {
|
if ($error->getCode() >= 400 && $error->getCode() < 500) {
|
||||||
// Register error logger
|
// Register error logger
|
||||||
$providerName = App::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
|
$providerName = App::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
|
||||||
|
@ -709,6 +710,7 @@ App::error()
|
||||||
$publish = true;
|
$publish = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
if ($logger && $publish) {
|
if ($logger && $publish) {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -62,7 +62,8 @@
|
||||||
"utopia-php/migration": "0.4.*",
|
"utopia-php/migration": "0.4.*",
|
||||||
"utopia-php/orchestration": "0.9.*",
|
"utopia-php/orchestration": "0.9.*",
|
||||||
"utopia-php/platform": "0.5.*",
|
"utopia-php/platform": "0.5.*",
|
||||||
"utopia-php/pools": "0.4.*",
|
"utopia-php/pools": "0.5.*",
|
||||||
|
"utopia-php/preloader": "0.2.*",
|
||||||
"utopia-php/queue": "0.7.*",
|
"utopia-php/queue": "0.7.*",
|
||||||
"utopia-php/registry": "0.5.*",
|
"utopia-php/registry": "0.5.*",
|
||||||
"utopia-php/storage": "0.18.*",
|
"utopia-php/storage": "0.18.*",
|
||||||
|
|
|
@ -7,8 +7,6 @@ use Appwrite\Platform\Tasks\Doctor;
|
||||||
use Appwrite\Platform\Tasks\Install;
|
use Appwrite\Platform\Tasks\Install;
|
||||||
use Appwrite\Platform\Tasks\Maintenance;
|
use Appwrite\Platform\Tasks\Maintenance;
|
||||||
use Appwrite\Platform\Tasks\Migrate;
|
use Appwrite\Platform\Tasks\Migrate;
|
||||||
use Appwrite\Platform\Tasks\QueueCount;
|
|
||||||
use Appwrite\Platform\Tasks\QueueRetry;
|
|
||||||
use Appwrite\Platform\Tasks\ScheduleFunctions;
|
use Appwrite\Platform\Tasks\ScheduleFunctions;
|
||||||
use Appwrite\Platform\Tasks\ScheduleMessages;
|
use Appwrite\Platform\Tasks\ScheduleMessages;
|
||||||
use Appwrite\Platform\Tasks\SDKs;
|
use Appwrite\Platform\Tasks\SDKs;
|
||||||
|
@ -18,6 +16,8 @@ use Appwrite\Platform\Tasks\Upgrade;
|
||||||
use Appwrite\Platform\Tasks\Vars;
|
use Appwrite\Platform\Tasks\Vars;
|
||||||
use Appwrite\Platform\Tasks\Version;
|
use Appwrite\Platform\Tasks\Version;
|
||||||
use Utopia\Platform\Service;
|
use Utopia\Platform\Service;
|
||||||
|
use Appwrite\Platform\Tasks\QueueRetry;
|
||||||
|
use Appwrite\Platform\Tasks\QueueCount;
|
||||||
|
|
||||||
class Tasks extends Service
|
class Tasks extends Service
|
||||||
{
|
{
|
||||||
|
@ -30,8 +30,6 @@ class Tasks extends Service
|
||||||
->addAction(Install::getName(), new Install())
|
->addAction(Install::getName(), new Install())
|
||||||
->addAction(Maintenance::getName(), new Maintenance())
|
->addAction(Maintenance::getName(), new Maintenance())
|
||||||
->addAction(Migrate::getName(), new Migrate())
|
->addAction(Migrate::getName(), new Migrate())
|
||||||
->addAction(QueueCount::getName(), new QueueCount())
|
|
||||||
->addAction(QueueRetry::getName(), new QueueRetry())
|
|
||||||
->addAction(SDKs::getName(), new SDKs())
|
->addAction(SDKs::getName(), new SDKs())
|
||||||
->addAction(SSL::getName(), new SSL())
|
->addAction(SSL::getName(), new SSL())
|
||||||
->addAction(ScheduleFunctions::getName(), new ScheduleFunctions())
|
->addAction(ScheduleFunctions::getName(), new ScheduleFunctions())
|
||||||
|
@ -40,6 +38,8 @@ class Tasks extends Service
|
||||||
->addAction(Upgrade::getName(), new Upgrade())
|
->addAction(Upgrade::getName(), new Upgrade())
|
||||||
->addAction(Vars::getName(), new Vars())
|
->addAction(Vars::getName(), new Vars())
|
||||||
->addAction(Version::getName(), new Version())
|
->addAction(Version::getName(), new Version())
|
||||||
|
->addAction(QueueRetry::getName(), new QueueRetry())
|
||||||
|
->addAction(QueueCount::getName(), new QueueCount())
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ use Utopia\CLI\Console;
|
||||||
use Utopia\Platform\Action;
|
use Utopia\Platform\Action;
|
||||||
use Utopia\Queue\Client;
|
use Utopia\Queue\Client;
|
||||||
use Utopia\Queue\Connection;
|
use Utopia\Queue\Connection;
|
||||||
|
use Utopia\Validator\Text;
|
||||||
use Utopia\Validator\WhiteList;
|
use Utopia\Validator\WhiteList;
|
||||||
|
|
||||||
class QueueCount extends Action
|
class QueueCount extends Action
|
||||||
|
@ -21,19 +22,7 @@ class QueueCount extends Action
|
||||||
{
|
{
|
||||||
$this
|
$this
|
||||||
->desc('Return the number of from a specific queue identified by the name parameter with a specific type')
|
->desc('Return the number of from a specific queue identified by the name parameter with a specific type')
|
||||||
->param('name', '', new WhiteList([
|
->param('name', '', new Text(100), 'Queue name')
|
||||||
Event::DATABASE_QUEUE_NAME,
|
|
||||||
Event::DELETE_QUEUE_NAME,
|
|
||||||
Event::AUDITS_QUEUE_NAME,
|
|
||||||
Event::MAILS_QUEUE_NAME,
|
|
||||||
Event::FUNCTIONS_QUEUE_NAME,
|
|
||||||
Event::USAGE_QUEUE_NAME,
|
|
||||||
Event::WEBHOOK_QUEUE_NAME,
|
|
||||||
Event::CERTIFICATES_QUEUE_NAME,
|
|
||||||
Event::BUILDS_QUEUE_NAME,
|
|
||||||
Event::MESSAGING_QUEUE_NAME,
|
|
||||||
Event::MIGRATIONS_QUEUE_NAME
|
|
||||||
]), 'Queue name')
|
|
||||||
->param('type', '', new WhiteList([
|
->param('type', '', new WhiteList([
|
||||||
'success',
|
'success',
|
||||||
'failed',
|
'failed',
|
||||||
|
|
|
@ -7,6 +7,8 @@ use Utopia\CLI\Console;
|
||||||
use Utopia\Platform\Action;
|
use Utopia\Platform\Action;
|
||||||
use Utopia\Queue\Client;
|
use Utopia\Queue\Client;
|
||||||
use Utopia\Queue\Connection;
|
use Utopia\Queue\Connection;
|
||||||
|
use Utopia\Validator\Integer;
|
||||||
|
use Utopia\Validator\Text;
|
||||||
use Utopia\Validator\WhiteList;
|
use Utopia\Validator\WhiteList;
|
||||||
use Utopia\Validator\Wildcard;
|
use Utopia\Validator\Wildcard;
|
||||||
|
|
||||||
|
@ -22,19 +24,7 @@ class QueueRetry extends Action
|
||||||
{
|
{
|
||||||
$this
|
$this
|
||||||
->desc('Retry failed jobs from a specific queue identified by the name parameter')
|
->desc('Retry failed jobs from a specific queue identified by the name parameter')
|
||||||
->param('name', '', new WhiteList([
|
->param('name', '', new Text(100), 'Queue name')
|
||||||
Event::DATABASE_QUEUE_NAME,
|
|
||||||
Event::DELETE_QUEUE_NAME,
|
|
||||||
Event::AUDITS_QUEUE_NAME,
|
|
||||||
Event::MAILS_QUEUE_NAME,
|
|
||||||
Event::FUNCTIONS_QUEUE_NAME,
|
|
||||||
Event::USAGE_QUEUE_NAME,
|
|
||||||
Event::WEBHOOK_CLASS_NAME,
|
|
||||||
Event::CERTIFICATES_QUEUE_NAME,
|
|
||||||
Event::BUILDS_QUEUE_NAME,
|
|
||||||
Event::MESSAGING_QUEUE_NAME,
|
|
||||||
Event::MIGRATIONS_QUEUE_NAME
|
|
||||||
]), 'Queue name')
|
|
||||||
->param('limit', 0, new Wildcard(), 'jobs limit', true)
|
->param('limit', 0, new Wildcard(), 'jobs limit', true)
|
||||||
->inject('queue')
|
->inject('queue')
|
||||||
->callback(fn ($name, $limit, $queue) => $this->action($name, $limit, $queue));
|
->callback(fn ($name, $limit, $queue) => $this->action($name, $limit, $queue));
|
||||||
|
|
Loading…
Reference in a new issue