Continue work on database metrics

This commit is contained in:
Bradley Schofield
2024-07-01 14:18:04 +09:00
parent cafb699a90
commit 52b990dd8f
2 changed files with 8 additions and 4 deletions
+2 -2
View File
@@ -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=
+6 -2
View File
@@ -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();
}
/**