PR review changes
This commit is contained in:
parent
284150a84a
commit
e37f70246e
4 changed files with 6 additions and 21 deletions
|
@ -565,7 +565,6 @@ $register->set('pools', function () {
|
||||||
$dsns = $connection['dsns'] ?? '';
|
$dsns = $connection['dsns'] ?? '';
|
||||||
$multipe = $connection['multiple'] ?? false;
|
$multipe = $connection['multiple'] ?? false;
|
||||||
$schemes = $connection['schemes'] ?? [];
|
$schemes = $connection['schemes'] ?? [];
|
||||||
$useResource = $connection['useResource'] ?? true;
|
|
||||||
$config = [];
|
$config = [];
|
||||||
$dsns = explode(',', $connection['dsns'] ?? '');
|
$dsns = explode(',', $connection['dsns'] ?? '');
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@ use Utopia\Queue\Message;
|
||||||
use Utopia\Queue\Server;
|
use Utopia\Queue\Server;
|
||||||
use Utopia\Registry\Registry;
|
use Utopia\Registry\Registry;
|
||||||
use Utopia\Logger\Log;
|
use Utopia\Logger\Log;
|
||||||
|
use Utopia\Logger\Logger;
|
||||||
|
|
||||||
Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
|
Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
|
||||||
|
|
||||||
|
@ -107,9 +108,7 @@ $server
|
||||||
->error()
|
->error()
|
||||||
->inject('error')
|
->inject('error')
|
||||||
->inject('logger')
|
->inject('logger')
|
||||||
->inject('register')
|
->action(function (Throwable $error, Logger $logger) {
|
||||||
->action(function ($error, $logger, $register) {
|
|
||||||
|
|
||||||
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');
|
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');
|
||||||
|
|
||||||
if ($error instanceof PDOException) {
|
if ($error instanceof PDOException) {
|
||||||
|
@ -124,7 +123,7 @@ $server
|
||||||
$log->setVersion($version);
|
$log->setVersion($version);
|
||||||
$log->setType(Log::TYPE_ERROR);
|
$log->setType(Log::TYPE_ERROR);
|
||||||
$log->setMessage($error->getMessage());
|
$log->setMessage($error->getMessage());
|
||||||
$log->setAction('appwrite-worker-functions');
|
$log->setAction('appwrite-queue-' . App::getEnv('QUEUE'));
|
||||||
$log->addTag('verboseType', get_class($error));
|
$log->addTag('verboseType', get_class($error));
|
||||||
$log->addTag('code', $error->getCode());
|
$log->addTag('code', $error->getCode());
|
||||||
$log->addExtra('file', $error->getFile());
|
$log->addExtra('file', $error->getFile());
|
||||||
|
@ -143,6 +142,4 @@ $server
|
||||||
Console::error('[Error] Message: ' . $error->getMessage());
|
Console::error('[Error] Message: ' . $error->getMessage());
|
||||||
Console::error('[Error] File: ' . $error->getFile());
|
Console::error('[Error] File: ' . $error->getFile());
|
||||||
Console::error('[Error] Line: ' . $error->getLine());
|
Console::error('[Error] Line: ' . $error->getLine());
|
||||||
|
|
||||||
$register->get('pools')->reclaim();
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -111,15 +111,13 @@ class BuildsV1 extends Worker
|
||||||
/** Trigger Webhook */
|
/** Trigger Webhook */
|
||||||
$deploymentModel = new Deployment();
|
$deploymentModel = new Deployment();
|
||||||
|
|
||||||
$data = $deployment->getArrayCopy(array_keys($deploymentModel->getRules()));
|
|
||||||
|
|
||||||
$deploymentUpdate = new Event(Event::WEBHOOK_QUEUE_NAME, Event::WEBHOOK_CLASS_NAME);
|
$deploymentUpdate = new Event(Event::WEBHOOK_QUEUE_NAME, Event::WEBHOOK_CLASS_NAME);
|
||||||
$deploymentUpdate
|
$deploymentUpdate
|
||||||
->setProject($project)
|
->setProject($project)
|
||||||
->setEvent('functions.[functionId].deployments.[deploymentId].update')
|
->setEvent('functions.[functionId].deployments.[deploymentId].update')
|
||||||
->setParam('functionId', $function->getId())
|
->setParam('functionId', $function->getId())
|
||||||
->setParam('deploymentId', $deployment->getId())
|
->setParam('deploymentId', $deployment->getId())
|
||||||
->setPayload($data)
|
->setPayload($deployment->getArrayCopy(array_keys($deploymentModel->getRules())))
|
||||||
->trigger();
|
->trigger();
|
||||||
|
|
||||||
/** Trigger Functions */
|
/** Trigger Functions */
|
||||||
|
@ -127,11 +125,7 @@ class BuildsV1 extends Worker
|
||||||
$connection = $pools->get('queue')->pop();
|
$connection = $pools->get('queue')->pop();
|
||||||
$functions = new Func($connection->getResource());
|
$functions = new Func($connection->getResource());
|
||||||
$functions
|
$functions
|
||||||
->setData(\json_encode($data))
|
->from($deploymentUpdate)
|
||||||
->setProject($project)
|
|
||||||
->setEvent('functions.[functionId].deployments.[deploymentId].update')
|
|
||||||
->setParam('functionId', $function->getId())
|
|
||||||
->setParam('deploymentId', $deployment->getId())
|
|
||||||
->trigger();
|
->trigger();
|
||||||
$connection->reclaim();
|
$connection->reclaim();
|
||||||
|
|
||||||
|
|
|
@ -187,12 +187,7 @@ class Schedule extends Action
|
||||||
|
|
||||||
$promiseStart = \time(); // in seconds
|
$promiseStart = \time(); // in seconds
|
||||||
$executionStart = $nextDate->getTimestamp(); // in seconds
|
$executionStart = $nextDate->getTimestamp(); // in seconds
|
||||||
$executionSleep = $executionStart - $promiseStart; // Time to wait from now until execution needs to be queued
|
$delay = $executionStart - $promiseStart; // Time to wait from now until execution needs to be queued
|
||||||
$delay = $executionSleep;
|
|
||||||
|
|
||||||
\var_dump($delay);
|
|
||||||
\var_dump(\time());
|
|
||||||
\var_dump('---');
|
|
||||||
|
|
||||||
if (!isset($delayedExecutions[$delay])) {
|
if (!isset($delayedExecutions[$delay])) {
|
||||||
$delayedExecutions[$delay] = [];
|
$delayedExecutions[$delay] = [];
|
||||||
|
|
Loading…
Reference in a new issue