From f48708ddf43ce59c9abd2da3fc3ceb21e51da5e3 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 28 Dec 2021 13:04:58 +0100 Subject: [PATCH] fix: use env var instead of hard coded value --- app/http.php | 4 ++-- app/init.php | 4 ++-- app/realtime.php | 6 +++--- app/tasks/usage.php | 4 ++-- src/Appwrite/Migration/Version/V11.php | 5 +++-- src/Appwrite/Resque/Worker.php | 3 ++- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/http.php b/app/http.php index abb2fd6f8..13223edfb 100644 --- a/app/http.php +++ b/app/http.php @@ -81,12 +81,12 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) { Console::success('[Setup] - Server database init started...'); $collections = Config::getParam('collections', []); /** @var array $collections */ - if(!$dbForConsole->exists('appwrite')) { + if(!$dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'))) { $redis->flushAll(); Console::success('[Setup] - Creating database: appwrite...'); - $dbForConsole->create('appwrite'); + $dbForConsole->create(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); } try { diff --git a/app/init.php b/app/init.php index b1ea6391e..03788776f 100644 --- a/app/init.php +++ b/app/init.php @@ -786,7 +786,7 @@ App::setResource('dbForProject', function($db, $cache, $project) { $cache = new Cache(new RedisCache($cache)); $database = new Database(new MariaDB($db), $cache); - $database->setDefaultDatabase('appwrite'); + $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $database->setNamespace('_project_'.$project->getId()); return $database; @@ -796,7 +796,7 @@ App::setResource('dbForConsole', function($db, $cache) { $cache = new Cache(new RedisCache($cache)); $database = new Database(new MariaDB($db), $cache); - $database->setDefaultDatabase('appwrite'); + $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $database->setNamespace('_project_console'); return $database; diff --git a/app/realtime.php b/app/realtime.php index 84e90557a..a671e149a 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -58,7 +58,7 @@ function getDatabase(Registry &$register, string $namespace) $cache = new Cache(new RedisCache($redis)); $database = new Database(new MariaDB($db), $cache); - $database->setDefaultDatabase('appwrite'); + $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $database->setNamespace($namespace); return [ @@ -341,7 +341,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $cache = new Cache(new RedisCache($redis)); $database = new Database(new MariaDB($db), $cache); - $database->setDefaultDatabase('appwrite'); + $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $database->setNamespace('_project_' . $project->getId()); /* @@ -446,7 +446,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re $cache = new Cache(new RedisCache($redis)); $database = new Database(new MariaDB($db), $cache); - $database->setDefaultDatabase('appwrite'); + $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $database->setNamespace('_project_' . $realtime->connections[$connection]['projectId']); /* diff --git a/app/tasks/usage.php b/app/tasks/usage.php index 24f5e86cf..690da5e2f 100644 --- a/app/tasks/usage.php +++ b/app/tasks/usage.php @@ -223,8 +223,8 @@ $cli $cacheAdapter = new Cache(new Redis($redis)); $dbForProject = new Database(new MariaDB($db), $cacheAdapter); $dbForConsole = new Database(new MariaDB($db), $cacheAdapter); - $dbForProject->setDefaultDatabase('appwrite'); - $dbForConsole->setDefaultDatabase('appwrite'); + $dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); + $dbForConsole->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $dbForConsole->setNamespace('_project_console'); $latestTime = []; diff --git a/src/Appwrite/Migration/Version/V11.php b/src/Appwrite/Migration/Version/V11.php index 81d2ddb48..36a13383e 100644 --- a/src/Appwrite/Migration/Version/V11.php +++ b/src/Appwrite/Migration/Version/V11.php @@ -11,6 +11,7 @@ use Redis; use Swoole\Runtime; use Throwable; use Utopia\Abuse\Adapters\TimeLimit; +use Utopia\App; use Utopia\Audit\Audit; use Utopia\Cache\Cache; use Utopia\CLI\Console; @@ -45,8 +46,8 @@ class V11 extends Migration $this->dbProject = new Database(new MariaDB($this->db), $cacheAdapter); // namespace is set on execution $this->dbConsole = new Database(new MariaDB($this->db), $cacheAdapter); - $this->dbProject->setDefaultDatabase('appwrite'); - $this->dbConsole->setDefaultDatabase('appwrite'); + $this->dbProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); + $this->dbConsole->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $this->dbConsole->setNamespace('_project_console'); } diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php index ea486f5f9..a09d00ee5 100644 --- a/src/Appwrite/Resque/Worker.php +++ b/src/Appwrite/Resque/Worker.php @@ -2,6 +2,7 @@ namespace Appwrite\Resque; +use Utopia\App; use Utopia\Cache\Cache; use Utopia\Cache\Adapter\Redis as RedisCache; use Utopia\CLI\Console; @@ -93,7 +94,7 @@ abstract class Worker $attempts++; $cache = new Cache(new RedisCache($register->get('cache'))); $database = new Database(new MariaDB($register->get('db')), $cache); - $database->setDefaultDatabase('appwrite'); + $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite')); $database->setNamespace($namespace); // Main DB if (!empty($projectId) && !$database->getDocument('projects', $projectId)->isEmpty()) { throw new \Exception("Project does not exist: {$projectId}");