CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-05-09 07:12:34 +12:00
Code Issues Projects Releases Wiki Activity

update variable namings

Browse source
This commit is contained in:
Damodar Lohani 2022-10-28 09:54:56 +00:00
parent 4c5273b8b2
commit 60f2d10a50
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env
View file

@ -77,7 +77,7 @@ _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
_APP_MAINTENANCE_RETENTION_ABUSE=86400 _APP_MAINTENANCE_RETENTION_ABUSE=86400
_APP_MAINTENANCE_RETENTION_AUDIT=1209600 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
_APP_USAGE_AGGREGATION_INTERVAL=5 _APP_USAGE_AGGREGATION_INTERVAL=5
_APP_MAINTENANCE_RETENTION_HOURLY_USAGE=8640000 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
_APP_USAGE_STATS=enabled _APP_USAGE_STATS=enabled
_APP_LOGGING_PROVIDER= _APP_LOGGING_PROVIDER=
_APP_LOGGING_CONFIG= _APP_LOGGING_CONFIG=

2
Dockerfile
View file

@ -252,7 +252,7 @@ ENV _APP_SERVER=swoole \
_APP_MAINTENANCE_RETENTION_AUDIT=1209600 \ _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
# 1 Day = 86400 s # 1 Day = 86400 s
_APP_MAINTENANCE_RETENTION_ABUSE=86400 \ _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
_APP_MAINTENANCE_RETENTION_HOURLY_USAGE=8640000 \ _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000 \
_APP_MAINTENANCE_INTERVAL=86400 \ _APP_MAINTENANCE_INTERVAL=86400 \
_APP_LOGGING_PROVIDER= \ _APP_LOGGING_PROVIDER= \
_APP_LOGGING_CONFIG= _APP_LOGGING_CONFIG=

2
app/config/variables.php
View file

@ -859,7 +859,7 @@ return [
'filter' => '' 'filter' => ''
], ],
[ [
'name' => '_APP_MAINTENANCE_RETENTION_HOURLY_USAGE', 'name' => '_APP_MAINTENANCE_RETENTION_USAGE_HOURLY',
'description' => 'The maximum duration (in seconds) upto which to retain hourly usage metrics. The default value is 8640000 seconds (100 days).', 'description' => 'The maximum duration (in seconds) upto which to retain hourly usage metrics. The default value is 8640000 seconds (100 days).',
'introduction' => '', 'introduction' => '',
'default' => '8640000', 'default' => '8640000',

10
app/tasks/maintenance.php
View file

@ -78,11 +78,11 @@ $cli
->trigger(); ->trigger();
} }
function notifyDeleteUsageStats(int $hourlyRetentionInterval) function notifyDeleteUsageStats(int $usageStatsRetentionHourly)
{ {
(new Delete()) (new Delete())
->setType(DELETE_TYPE_USAGE) ->setType(DELETE_TYPE_USAGE)
->setHourlyUsageRetentionDatetime(DateTime::addSeconds(new \DateTime(), -1 * $hourlyRetentionInterval)) ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
->trigger(); ->trigger();
} }
@ -143,11 +143,11 @@ $cli
$executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600'); $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600');
$auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', '1209600'); $auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', '1209600');
$abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', '86400'); $abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', '86400');
$hourlyUsageStatsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_HOURLY_USAGE', '8640000'); //100 days $usageStatsRetentionHourly = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_HOURLY', '8640000'); //100 days
$cacheRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_CACHE', '2592000'); // 30 days $cacheRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_CACHE', '2592000'); // 30 days
Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $hourlyUsageStatsRetention, $cacheRetention) { Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetentionHourly, $cacheRetention) {
$database = getConsoleDB(); $database = getConsoleDB();
$time = DateTime::now(); $time = DateTime::now();
@ -156,7 +156,7 @@ $cli
notifyDeleteExecutionLogs($executionLogsRetention); notifyDeleteExecutionLogs($executionLogsRetention);
notifyDeleteAbuseLogs($abuseLogsRetention); notifyDeleteAbuseLogs($abuseLogsRetention);
notifyDeleteAuditLogs($auditLogRetention); notifyDeleteAuditLogs($auditLogRetention);
notifyDeleteUsageStats($hourlyUsageStatsRetention); notifyDeleteUsageStats($usageStatsRetentionHourly);
notifyDeleteConnections(); notifyDeleteConnections();
notifyDeleteExpiredSessions(); notifyDeleteExpiredSessions();
renewCertificates($database); renewCertificates($database);

4
app/views/install/compose.phtml
View file

@ -150,7 +150,7 @@ services:
- _APP_MAINTENANCE_RETENTION_CACHE - _APP_MAINTENANCE_RETENTION_CACHE
- _APP_MAINTENANCE_RETENTION_ABUSE - _APP_MAINTENANCE_RETENTION_ABUSE
- _APP_MAINTENANCE_RETENTION_AUDIT - _APP_MAINTENANCE_RETENTION_AUDIT
- _APP_MAINTENANCE_RETENTION_HOURLY_USAGE - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
- _APP_SMS_PROVIDER - _APP_SMS_PROVIDER
- _APP_SMS_FROM - _APP_SMS_FROM
@ -550,7 +550,7 @@ services:
- _APP_MAINTENANCE_RETENTION_CACHE - _APP_MAINTENANCE_RETENTION_CACHE
- _APP_MAINTENANCE_RETENTION_ABUSE - _APP_MAINTENANCE_RETENTION_ABUSE
- _APP_MAINTENANCE_RETENTION_AUDIT - _APP_MAINTENANCE_RETENTION_AUDIT
- _APP_MAINTENANCE_RETENTION_HOURLY_USAGE - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
appwrite-usage: appwrite-usage:
image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?> image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>

4
docker-compose.yml
View file

@ -171,7 +171,7 @@ services:
- _APP_MAINTENANCE_RETENTION_CACHE - _APP_MAINTENANCE_RETENTION_CACHE
- _APP_MAINTENANCE_RETENTION_ABUSE - _APP_MAINTENANCE_RETENTION_ABUSE
- _APP_MAINTENANCE_RETENTION_AUDIT - _APP_MAINTENANCE_RETENTION_AUDIT
- _APP_MAINTENANCE_RETENTION_HOURLY_USAGE - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
- _APP_SMS_PROVIDER - _APP_SMS_PROVIDER
- _APP_SMS_FROM - _APP_SMS_FROM
@ -603,7 +603,7 @@ services:
- _APP_MAINTENANCE_RETENTION_CACHE - _APP_MAINTENANCE_RETENTION_CACHE
- _APP_MAINTENANCE_RETENTION_ABUSE - _APP_MAINTENANCE_RETENTION_ABUSE
- _APP_MAINTENANCE_RETENTION_AUDIT - _APP_MAINTENANCE_RETENTION_AUDIT
- _APP_MAINTENANCE_RETENTION_HOURLY_USAGE - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
appwrite-usage: appwrite-usage:
entrypoint: usage entrypoint: usage

2
src/Appwrite/Event/Delete.php
View file

@ -60,7 +60,7 @@ class Delete extends Event
* @param string $datetime * @param string $datetime
* @return self * @return self
*/ */
public function setHourlyUsageRetentionDatetime(string $datetime): self public function setUsageRetentionHourlyDateTime(string $datetime): self
{ {
$this->hourlyUsageRetentionDatetime = $datetime; $this->hourlyUsageRetentionDatetime = $datetime;
return $this; return $this;