CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-28 15:31:43 +12:00
Code Issues Projects Releases Wiki Activity

fix: adding getConsoleDB injection

Browse source
This commit is contained in:
Binyamin Yawitz 2024-09-06 15:52:04 -04:00
parent d0cc9c8a13
commit b200e66bd1
No known key found for this signature in database
1 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
app/init.php
View file

@ -507,6 +507,7 @@ $servers = new Dependency();
$register = new Dependency();
$connections = new Dependency();
$localeCodes = new Dependency();
$getConsoleDB = new Dependency();
$getProjectDB = new Dependency();
$dbForProject = new Dependency();
$dbForConsole = new Dependency();
@ -820,33 +821,12 @@ $dbForProject
$dbForConsole
->setName('dbForConsole')
->inject('pools')
->inject('cache')
->inject('authorization')
->inject('getConsoleDB')
->inject('connections')
->setCallback(function (array $pools, Cache $cache, Authorization $authorization, Connections $connections): Database {
$pool = $pools['pools-console-console']['pool'];
$dsn = $pools['pools-console-console']['dsn'];
$connection = $pool->get();
->setCallback(function (callable $getConsoleDB, Connections $connections): Database {
[$connection,$pool, $database] = $getConsoleDB();
$connections->add($connection, $pool);
$adapter = match ($dsn->getScheme()) {
'mariadb' => new MariaDB($connection),
'mysql' => new MySQL($connection),
default => null
};
$adapter->setDatabase($dsn->getPath());
$database = new Database($adapter, $cache);
$database->setAuthorization($authorization);
$database
->setNamespace('_console')
->setMetadata('host', \gethostname())
->setMetadata('project', 'console')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
return $database;
});
@ -1153,6 +1133,38 @@ $requestTimestamp
}
return $requestTimestamp;
});
$getConsoleDB
->setName('getConsoleDB')
->inject('pools')
->inject('cache')
->inject('authorization')
->inject('connections')
->setCallback(function (array $pools, Cache $cache, Authorization $authorization) {
return function () use ($pools, $cache, $authorization): array {
$pool = $pools['pools-console-console']['pool'];
$dsn = $pools['pools-console-console']['dsn'];
$connection = $pool->get();
$adapter = match ($dsn->getScheme()) {
'mariadb' => new MariaDB($connection),
'mysql' => new MySQL($connection),
default => null
};
$adapter->setDatabase($dsn->getPath());
$database = new Database($adapter, $cache);
$database->setAuthorization($authorization);
$database
->setNamespace('_console')
->setMetadata('host', \gethostname())
->setMetadata('project', 'console')
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
return [$connection, $pool, $database];
};
});
$getProjectDB
->setName('getProjectDB')
@ -1355,6 +1367,7 @@ $container->set($connections);
$container->set($localeCodes);
$container->set($dbForProject);
$container->set($dbForConsole);
$container->set($getConsoleDB);
$container->set($getProjectDB);
$container->set($queueForUsage);
$container->set($queueForMails);