CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-08-04 13:01:45 +12:00
Code Issues Projects Releases Wiki Activity

feat: update worker class

Browse source
This commit is contained in:
Christy Jacob 2022-07-02 10:54:19 +02:00
parent 3ab4dcb7c1
commit a0c43f1fe3
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/tasks/usage.php
View file

@ -324,16 +324,17 @@ $cli
foreach ($points as $point) {
$projectId = $point['projectId'];
/** Get the Dabatase name from the console DB */
$project = Authorization::skip(fn() => $dbForConsole->getDocument('projects', $projectId));
$dbName = $project->getAttribute('database', '');
$projectDB = $dbPool->get($dbName);
$dbForProject = new Database(new MariaDB($projectDB), $cacheAdapter);
$dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
if (!empty($projectId) && $projectId !== 'console') {
/** Get the Dabatase name from the console DB */
$project = Authorization::skip(fn() => $dbForConsole->getDocument('projects', $projectId));
var_dump($projectId);
var_dump($project);
$dbName = $project->getAttribute('database', '');
$projectDB = $dbPool->getDB($dbName);
$dbForProject = new Database(new MariaDB($projectDB), $cacheAdapter);
$dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
$dbForProject->setNamespace('_' . $projectId);
$metricUpdated = $metric;
@ -373,8 +374,6 @@ $cli
Console::warning($e->getTraceAsString());
}
}
$dbPool->put($projectDB, $dbName);
}
} catch (\Exception $e) {
Console::warning("Failed to Query: {$e->getMessage()}");

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

@ -160,19 +160,20 @@ abstract class Worker
*/
protected function getProjectDB(string $projectId): Database
{
global $register;
if (!$projectId) {
throw new \Exception('ProjectID not provided - cannot get database');
}
$namespace = "_{$projectId}";
global $register;
$dbForConsole = $this->getConsoleDB();
$project = $dbForConsole->getDocument('projects', $projectId);
$dbName = $project->getAttribute('database', '');
$projectDB = $register->get('dbPool')->getDB($dbName);
return $this->getDB(self::DATABASE_PROJECT, $projectDB, $namespace);
}