diff --git a/.env b/.env index b889ebb513..36738f853a 100644 --- a/.env +++ b/.env @@ -26,8 +26,8 @@ _APP_REDIS_USER= _APP_DB_HOST=mariadb _APP_DB_PORT=3306 _APP_DB_SCHEMA=appwrite -_APP_DB_USER=user -_APP_DB_PASS=password +_APP_DB_USER=root +_APP_DB_PASS=rootsecretpassword _APP_DB_ROOT_PASS=rootsecretpassword _APP_STORAGE_DEVICE=Local _APP_STORAGE_S3_ACCESS_KEY= diff --git a/src/Appwrite/Platform/Workers/Databases.php b/src/Appwrite/Platform/Workers/Databases.php index 81c12a13b2..9229970eb1 100644 --- a/src/Appwrite/Platform/Workers/Databases.php +++ b/src/Appwrite/Platform/Workers/Databases.php @@ -83,7 +83,7 @@ class Databases extends Action DATABASE_TYPE_DELETE_ATTRIBUTE => $this->deleteAttribute($database, $collection, $document, $project, $dbForConsole, $dbForProject), DATABASE_TYPE_CREATE_INDEX => $this->createIndex($database, $collection, $document, $project, $dbForConsole, $dbForProject), DATABASE_TYPE_DELETE_INDEX => $this->deleteIndex($database, $collection, $document, $project, $dbForConsole, $dbForProject), - DATABASE_TYPE_CALCULATE_STORAGE_USAGE => $this->calculateStorageUsage($payload, $dbForProject, $queueForUsage), + DATABASE_TYPE_CALCULATE_STORAGE_USAGE => $this->calculateStorageUsage($payload, $project, $dbForProject, $queueForUsage), default => throw new \Exception('No database operation for type: ' . \strval($type)), }; } @@ -494,7 +494,7 @@ class Databases extends Action * @throws Authorization * @throws DatabaseException */ - private function calculateStorageUsage(array $payload, Database $dbForProject, Usage $queueForUsage): void + private function calculateStorageUsage(array $payload, Document $project, Database $dbForProject, Usage $queueForUsage): void { if (!isset($payload['databaseInternalId'])) { throw new Exception('Missing Database'); @@ -528,6 +528,10 @@ class Databases extends Action $databaseInternalId, $collectionInternalId ], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), $collectionStorageUsage); + + Console::info('Calculated storage usage for database: ' . $databaseInternalId . ' and collection: ' . $collectionInternalId); + $queueForUsage->setProject($project); + $queueForUsage->trigger(); } /**