diff --git a/app/tasks/usage.php b/app/tasks/usage.php index f7e5ffb892..9d0060a26c 100644 --- a/app/tasks/usage.php +++ b/app/tasks/usage.php @@ -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()}"); diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php index d3fbccea07..47060d9d8f 100644 --- a/src/Appwrite/Resque/Worker.php +++ b/src/Appwrite/Resque/Worker.php @@ -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); }