feat: fix realtime tests
This commit is contained in:
parent
afd40cae77
commit
8e936dc3c2
2 changed files with 1313 additions and 1312 deletions
|
@ -102,13 +102,14 @@ function getDatabase(Registry &$register, string $namespace)
|
||||||
$consoleDB = $register->get('dbPool')->getConsoleDBFromPool();
|
$consoleDB = $register->get('dbPool')->getConsoleDBFromPool();
|
||||||
$db = $consoleDB;
|
$db = $consoleDB;
|
||||||
$dbName = '';
|
$dbName = '';
|
||||||
|
|
||||||
if ($namespace != '_console') {
|
if ($namespace != '_console') {
|
||||||
$cache = new Cache(new RedisCache($redis));
|
$cache = new Cache(new RedisCache($redis));
|
||||||
$database = new Database(new MariaDB($consoleDB), $cache);
|
$database = new Database(new MariaDB($consoleDB), $cache);
|
||||||
$database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
|
$database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
|
||||||
$database->setNamespace('_console'); // Main DB
|
$database->setNamespace('_console'); // Main DB
|
||||||
|
|
||||||
$project = $consoleDB->getDocument('projects', $namespace);
|
$project = $database->getDocument('projects', ltrim($namespace, '_'));
|
||||||
$dbName = $project->getAttribute('database', '');
|
$dbName = $project->getAttribute('database', '');
|
||||||
if (!empty($dbName)) {
|
if (!empty($dbName)) {
|
||||||
$projectDB = $register->get('dbPool')->getDBFromPool($dbName);
|
$projectDB = $register->get('dbPool')->getDBFromPool($dbName);
|
||||||
|
@ -319,8 +320,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
|
||||||
|
|
||||||
if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
|
if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
|
||||||
$connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
|
$connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
|
||||||
[$database, $returnDatabase] = getDatabase($register, "_{$projectId}");
|
|
||||||
|
|
||||||
|
[$database, $returnDatabase] = getDatabase($register, "_{$projectId}");
|
||||||
$user = $database->getDocument('users', $userId);
|
$user = $database->getDocument('users', $userId);
|
||||||
|
|
||||||
$roles = Auth::getRoles($user);
|
$roles = Auth::getRoles($user);
|
||||||
|
@ -391,7 +392,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
|
||||||
/*
|
/*
|
||||||
* Project Check
|
* Project Check
|
||||||
*/
|
*/
|
||||||
var_dump($project);
|
// var_dump($project);
|
||||||
if (empty($project->getId())) {
|
if (empty($project->getId())) {
|
||||||
throw new Exception('Missing or unknown project ID', 1008);
|
throw new Exception('Missing or unknown project ID', 1008);
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue