Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch '0.13.x' of https://github.com/appwrite/appwrite into 0.13.x

Browse source
This commit is contained in:
Torsten Dittmann 2022-03-02 13:21:02 +01:00
commit a7f3fde528
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/storage.php
View file

@ -1580,7 +1580,7 @@ App::get('/v1/storage/usage')
]; ];
$metrics = [ $metrics = [
"storage.tags.total", "storage.deployments.total",
"storage.files.total", "storage.files.total",
"storage.files.count", "storage.files.count",
"storage.buckets.count", "storage.buckets.count",
@ -1635,7 +1635,7 @@ App::get('/v1/storage/usage')
$usage = new Document([ $usage = new Document([
'range' => $range, 'range' => $range,
'filesStorage' => $stats['storage.files.total'], 'filesStorage' => $stats['storage.files.total'],
'tagsStorage' => $stats['storage.tags.total'], 'deploymentsStorage' => $stats['storage.deployments.total'],
'filesCount' => $stats['storage.files.count'], 'filesCount' => $stats['storage.files.count'],
'bucketsCount' => $stats['storage.buckets.count'], 'bucketsCount' => $stats['storage.buckets.count'],
'bucketsCreate' => $stats['storage.buckets.create'], 'bucketsCreate' => $stats['storage.buckets.create'],

2
app/tasks/usage.php
View file

@ -418,7 +418,7 @@ $cli
// Get total storage // Get total storage
$dbForProject->setNamespace('_' . $projectId); $dbForProject->setNamespace('_' . $projectId);
$storageTotal = $dbForProject->sum('tags', 'size'); $storageTotal = $dbForProject->sum('deployments', 'size');
$time = (int) (floor(time() / 1800) * 1800); // Time rounded to nearest 30 minutes $time = (int) (floor(time() / 1800) * 1800); // Time rounded to nearest 30 minutes
$id = \md5($time . '_30m_storage.deployments.total'); //Construct unique id for each metric using time, period and metric $id = \md5($time . '_30m_storage.deployments.total'); //Construct unique id for each metric using time, period and metric