Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
This commit is contained in:
commit
ff2ec8a93b
2 changed files with 4 additions and 2 deletions
|
@ -14,6 +14,7 @@ use Utopia\CLI\Console;
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Database\Database;
|
use Utopia\Database\Database;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
|
use Utopia\Database\Validator\Authorization;
|
||||||
use Utopia\Queue\Adapter\Swoole;
|
use Utopia\Queue\Adapter\Swoole;
|
||||||
use Utopia\Queue\Message;
|
use Utopia\Queue\Message;
|
||||||
use Utopia\Queue\Server;
|
use Utopia\Queue\Server;
|
||||||
|
@ -107,7 +108,7 @@ $connection = $pools->get('queue')->pop()->getResource();
|
||||||
$workerNumber = swoole_cpu_num() * intval(App::getEnv('_APP_WORKER_PER_CORE', 6));
|
$workerNumber = swoole_cpu_num() * intval(App::getEnv('_APP_WORKER_PER_CORE', 6));
|
||||||
|
|
||||||
if (empty(App::getEnv('QUEUE'))) {
|
if (empty(App::getEnv('QUEUE'))) {
|
||||||
throw new Exception('Please configure "QUEUE" environemnt variable.');
|
throw new Exception('Please configure "QUEUE" environment variable.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$adapter = new Swoole($connection, $workerNumber, App::getEnv('QUEUE'));
|
$adapter = new Swoole($connection, $workerNumber, App::getEnv('QUEUE'));
|
||||||
|
@ -145,7 +146,7 @@ $server
|
||||||
$log->addExtra('line', $error->getLine());
|
$log->addExtra('line', $error->getLine());
|
||||||
$log->addExtra('trace', $error->getTraceAsString());
|
$log->addExtra('trace', $error->getTraceAsString());
|
||||||
$log->addExtra('detailedTrace', $error->getTrace());
|
$log->addExtra('detailedTrace', $error->getTrace());
|
||||||
$log->addExtra('roles', \Utopia\Database\Validator\Authorization::$roles);
|
$log->addExtra('roles', Authorization::getRoles());
|
||||||
|
|
||||||
$isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
|
$isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
|
||||||
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
|
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
|
||||||
|
|
|
@ -467,6 +467,7 @@ services:
|
||||||
- openruntimes-executor
|
- openruntimes-executor
|
||||||
environment:
|
environment:
|
||||||
- _APP_ENV
|
- _APP_ENV
|
||||||
|
- _APP_WORKER_PER_CORE
|
||||||
- _APP_OPENSSL_KEY_V1
|
- _APP_OPENSSL_KEY_V1
|
||||||
- _APP_REDIS_HOST
|
- _APP_REDIS_HOST
|
||||||
- _APP_REDIS_PORT
|
- _APP_REDIS_PORT
|
||||||
|
|
Loading…
Reference in a new issue