CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-03 03:14:50 +12:00
Code Issues Projects Releases Wiki Activity

fix: use env var instead of hard coded value

Browse source
This commit is contained in:
Torsten Dittmann 2021-12-28 13:04:58 +01:00
parent afde0cb680
commit f48708ddf4
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/http.php
View file

@ -81,12 +81,12 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
Console::success('[Setup] - Server database init started...'); Console::success('[Setup] - Server database init started...');
$collections = Config::getParam('collections', []); /** @var array $collections */ $collections = Config::getParam('collections', []); /** @var array $collections */
if(!$dbForConsole->exists('appwrite')) { if(!$dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'))) {
$redis->flushAll(); $redis->flushAll();
Console::success('[Setup] - Creating database: appwrite...'); Console::success('[Setup] - Creating database: appwrite...');
$dbForConsole->create('appwrite'); $dbForConsole->create(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
} }
try { try {

4
app/init.php
View file

@ -786,7 +786,7 @@ App::setResource('dbForProject', function($db, $cache, $project) {
$cache = new Cache(new RedisCache($cache)); $cache = new Cache(new RedisCache($cache));
$database = new Database(new MariaDB($db), $cache); $database = new Database(new MariaDB($db), $cache);
$database->setDefaultDatabase('appwrite'); $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$database->setNamespace('_project_'.$project->getId()); $database->setNamespace('_project_'.$project->getId());
return $database; return $database;
@ -796,7 +796,7 @@ App::setResource('dbForConsole', function($db, $cache) {
$cache = new Cache(new RedisCache($cache)); $cache = new Cache(new RedisCache($cache));
$database = new Database(new MariaDB($db), $cache); $database = new Database(new MariaDB($db), $cache);
$database->setDefaultDatabase('appwrite'); $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$database->setNamespace('_project_console'); $database->setNamespace('_project_console');
return $database; return $database;

6
app/realtime.php
View file

@ -58,7 +58,7 @@ function getDatabase(Registry &$register, string $namespace)
$cache = new Cache(new RedisCache($redis)); $cache = new Cache(new RedisCache($redis));
$database = new Database(new MariaDB($db), $cache); $database = new Database(new MariaDB($db), $cache);
$database->setDefaultDatabase('appwrite'); $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$database->setNamespace($namespace); $database->setNamespace($namespace);
return [ return [
@ -341,7 +341,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
$cache = new Cache(new RedisCache($redis)); $cache = new Cache(new RedisCache($redis));
$database = new Database(new MariaDB($db), $cache); $database = new Database(new MariaDB($db), $cache);
$database->setDefaultDatabase('appwrite'); $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$database->setNamespace('_project_' . $project->getId()); $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)); $cache = new Cache(new RedisCache($redis));
$database = new Database(new MariaDB($db), $cache); $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']); $database->setNamespace('_project_' . $realtime->connections[$connection]['projectId']);
/* /*

4
app/tasks/usage.php
View file

@ -223,8 +223,8 @@ $cli
$cacheAdapter = new Cache(new Redis($redis)); $cacheAdapter = new Cache(new Redis($redis));
$dbForProject = new Database(new MariaDB($db), $cacheAdapter); $dbForProject = new Database(new MariaDB($db), $cacheAdapter);
$dbForConsole = new Database(new MariaDB($db), $cacheAdapter); $dbForConsole = new Database(new MariaDB($db), $cacheAdapter);
$dbForProject->setDefaultDatabase('appwrite'); $dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$dbForConsole->setDefaultDatabase('appwrite'); $dbForConsole->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$dbForConsole->setNamespace('_project_console'); $dbForConsole->setNamespace('_project_console');
$latestTime = []; $latestTime = [];

5
src/Appwrite/Migration/Version/V11.php
View file

@ -11,6 +11,7 @@ use Redis;
use Swoole\Runtime; use Swoole\Runtime;
use Throwable; use Throwable;
use Utopia\Abuse\Adapters\TimeLimit; use Utopia\Abuse\Adapters\TimeLimit;
use Utopia\App;
use Utopia\Audit\Audit; use Utopia\Audit\Audit;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\CLI\Console; 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->dbProject = new Database(new MariaDB($this->db), $cacheAdapter); // namespace is set on execution
$this->dbConsole = new Database(new MariaDB($this->db), $cacheAdapter); $this->dbConsole = new Database(new MariaDB($this->db), $cacheAdapter);
$this->dbProject->setDefaultDatabase('appwrite'); $this->dbProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$this->dbConsole->setDefaultDatabase('appwrite'); $this->dbConsole->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$this->dbConsole->setNamespace('_project_console'); $this->dbConsole->setNamespace('_project_console');
} }

3
src/Appwrite/Resque/Worker.php
View file

@ -2,6 +2,7 @@
namespace Appwrite\Resque; namespace Appwrite\Resque;
use Utopia\App;
use Utopia\Cache\Cache; use Utopia\Cache\Cache;
use Utopia\Cache\Adapter\Redis as RedisCache; use Utopia\Cache\Adapter\Redis as RedisCache;
use Utopia\CLI\Console; use Utopia\CLI\Console;
@ -93,7 +94,7 @@ abstract class Worker
$attempts++; $attempts++;
$cache = new Cache(new RedisCache($register->get('cache'))); $cache = new Cache(new RedisCache($register->get('cache')));
$database = new Database(new MariaDB($register->get('db')), $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 $database->setNamespace($namespace); // Main DB
if (!empty($projectId) && !$database->getDocument('projects', $projectId)->isEmpty()) { if (!empty($projectId) && !$database->getDocument('projects', $projectId)->isEmpty()) {
throw new \Exception("Project does not exist: {$projectId}"); throw new \Exception("Project does not exist: {$projectId}");