CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-03 10:46:27 +13:00
Code Issues Projects Releases Wiki Activity

feat: rename db to consoleDB

Browse source
This commit is contained in:
Christy Jacob 2022-06-30 13:01:29 +02:00
parent b303f20cac
commit 1c1a635d5a
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/health.php
View file

@ -64,10 +64,10 @@ App::get('/v1/health/db')
$checkStart = \microtime(true);
try {
$db = $utopia->getResource('db'); /* @var $db PDO */
$consoleDB = $utopia->getResource('consoleDB'); /* @var $db PDO */
// Run a small test to check the connection
$statement = $db->prepare("SELECT 1;");
$statement = $consoleDB->prepare("SELECT 1;");
$statement->closeCursor();

12
app/http.php
View file

@ -69,7 +69,7 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
do {
try {
$attempts++;
$db = $register->get('dbPool')->getConsoleDB();
$consoleDB = $register->get('dbPool')->getConsoleDB();
$redis = $register->get('redisPool')->get();
break; // leave the do-while if successful
} catch (\Exception $e) {
@ -81,7 +81,7 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
}
} while ($attempts < $max);
App::setResource('db', fn() => $db);
App::setResource('consoleDB', fn() => $consoleDB);
App::setResource('cache', fn() => $redis);
$dbForConsole = $app->getResource('dbForConsole'); /** @var Utopia\Database\Database $dbForConsole */
@ -243,15 +243,15 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
$app = new App('UTC');
$dbPool = $register->get('dbPool');
$db = $dbPool->getConsoleDB();
$consoleDB = $dbPool->getConsoleDB();
$redis = $register->get('redisPool')->get();
App::setResource('db', fn() => $db);
App::setResource('consoleDB', fn() => $consoleDB);
App::setResource('dbPool', fn() => $dbPool);
App::setResource('cache', fn() => $redis);
$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', 'console'));
$projectDB = $db;
$projectDB = $consoleDB;
if ($projectId !== 'console') {
$dbForConsole = $app->getResource('dbForConsole'); /** @var Utopia\Database\Database $dbForConsole */
$project = Authorization::skip(fn() => $dbForConsole->getDocument('projects', $projectId));
@ -359,7 +359,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
$swooleResponse->end(\json_encode($output));
} finally {
/** @var PDOPool $consolePool */
$dbPool->putConsoleDb($db);
$dbPool->putConsoleDb($consoleDB);
if (!empty($dbName) && !empty($projectDB)) {
$dbPool->put($projectDB, $dbName);

6
app/init.php
View file

@ -899,15 +899,15 @@ App::setResource('console', function () {
]);
}, []);
App::setResource('dbForConsole', function ($db, $cache) {
App::setResource('dbForConsole', function ($consoleDB, $cache) {
$cache = new Cache(new RedisCache($cache));
$database = new Database(new MariaDB($db), $cache);
$database = new Database(new MariaDB($consoleDB), $cache);
$database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$database->setNamespace('_console');
return $database;
}, ['db', 'cache']);
}, ['consoleDB', 'cache']);
App::setResource('deviceLocal', function () {