chore: merge

This commit is contained in:
Binyamin Yawitz 2024-06-20 17:26:40 -04:00
parent 6c26e2eb51
commit bc46ce30ab
No known key found for this signature in database
3 changed files with 1 additions and 83 deletions

View file

@ -119,84 +119,3 @@ $cli
$cli
->setContainer($container)
->run();
require_once __DIR__ . '/init2.php';
use Swoole\Runtime;
use Utopia\CLI\Adapters\Swoole as SwooleCLI;
use Utopia\DI\Dependency;
global $global, $container;
Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
/**
* @var Registry $global
* @var Container $container
*/
$register = new Dependency();
$logError = new Dependency();
$queueForDeletes = new Dependency();
$queueForCertificates = new Dependency();
$register
->setName('register')
->setCallback(function () use (&$global): Registry {
return $global;
});
$queueForDeletes
->setName('queueForDeletes')
->inject('queue')
->setCallback(function (Connection $queue) {
return new Delete($queue);
});
$queueForCertificates
->setName('queueForCertificates')
->inject('queue')
->setCallback(function (Connection $queue) {
return new Certificate($queue);
});
$logError
->setName('logError')
->inject('register')
->setCallback(function (Registry $register) {
return function (Throwable $error, string $namespace, string $action) use ($register) {
$logger = $register->get('logger');
if ($logger) {
$version = System::getEnv('_APP_VERSION', 'UNKNOWN');
$log = new Log();
$log->setNamespace($namespace);
$log->setServer(\gethostname());
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
$log->addTag('code', $error->getCode());
$log->addTag('verboseType', get_class($error));
$log->addExtra('file', $error->getFile());
$log->addExtra('line', $error->getLine());
$log->addExtra('trace', $error->getTraceAsString());
$log->addExtra('detailedTrace', $error->getTrace());
$log->setAction($action);
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
$responseCode = $logger->addLog($log);
Console::info('Usage stats log pushed with status code: ' . $responseCode);
}
Console::warning("Failed: {$error->getMessage()}");
Console::warning($error->getTraceAsString());
};
});
$container->set($logError);
$container->set($register);
$container->set($queueForDeletes);
$container->set($queueForCertificates);
$platform->init(Service::TYPE_CLI, ['adapter' => new SwooleCLI(1)]);
$cli
->init()
->inject('authorization')
->action(function (Authorization $authorization) {
$authorization->disable();
});
$cli
->setContainer($container)
->run();

@ -1 +1 @@
Subproject commit 053a975eb7f9b8c28847e7a52852f3b6189b986b
Subproject commit 5169fe16d63066f64ab5013c78953aea04e24b53

View file

@ -70,7 +70,6 @@
"utopia-php/queue": "dev-feat-coroutine-and-di as 0.7.99",
"utopia-php/registry": "0.5.*",
"utopia-php/storage": "dev-feat-framework-v2-v2 as 0.18.99",
"utopia-php/swoole": "0.8.*",
"utopia-php/system": "0.8.*",
"utopia-php/vcs": "0.6.*",
"utopia-php/websocket": "0.1.*",