Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressing comments

Browse Source
This commit is contained in:
fogelito
2023-10-18 19:36:56 +03:00
parent f7070d6fa0
commit 237369db1c
3 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
-2
View File
@@ -93,8 +93,6 @@ _APP_USAGE_AGGREGATION_INTERVAL=5
_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
_APP_USAGE_STATS=enabled
_APP_LOGGING_PROVIDER=sentry
_APP_LOGGING_CONFIG=sentry_config
_APP_GRAPHQL_MAX_BATCH_SIZE=10
_APP_GRAPHQL_MAX_COMPLEXITY=250
_APP_GRAPHQL_MAX_DEPTH=3
src/Appwrite/Platform/Tasks/Backup.php
+7 -25
View File
@@ -42,9 +42,9 @@ class Backup extends Action
$this
->desc('Backup a database')
->param('database', null, new Text(20), 'Database name, for example db_fra1_01')
->inject('logger')
->inject('log')
->callback(fn(string $database, Group $pools, ?Logger $logger, Log $log) => $this->action($database, $pools, $logger, $log));
->inject('pools')
->inject('logError')
->callback(fn(string $database, Group $pools, callable $logError) => $this->action($database, $pools, $logError));
}
public static function getName(): string
@@ -55,7 +55,7 @@ class Backup extends Action
/**
* @throws Exception
*/
public function action(string $database, Group $pools, ?Logger $logger, Log $log): void
public function action(string $database, Group $pools, callable $logError): void
{
$this->checkEnvVariables();
@@ -86,31 +86,16 @@ class Backup extends Action
$this->setContainerId();
$this->setProcessors();
Console::loop(function () use ($logger, $log) {
Console::loop(function () use ($logError) {
try {
$this->start();
} catch (Exception $error) {
if ($logger) {
$log->setNamespace("appwrite-backup");
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
$log->setAction('appwrite-backup');
$log->addExtra('file', $error->getFile());
$log->addExtra('line', $error->getLine());
$log->addExtra('trace', $error->getTraceAsString());
$log->addExtra('detailedTrace', $error->getTrace());
$isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
$responseCode = $logger->addLog($log);
Console::info('Usage stats log pushed with status code: ' . $responseCode);
}
Console::error('[Error] Time: ' . date('Y-m-d H:i:s'));
Console::error('[Error] Message: ' . $error->getMessage());
Console::error('[Error] File: ' . $error->getFile());
Console::error('[Error] Line: ' . $error->getLine());
$logError($error, 'backup', 'action');
}
}, self::BACKUP_INTERVAL_SECONDS);
}
@@ -324,9 +309,6 @@ class Backup extends Action
$processors = str_replace(PHP_EOL, '', $stdout);
$processors = empty($processors) ? 1 : intval($processors);
//$this->processors = \max(1, $processors - 2);
// todo: Using all processors was with no errors
$this->processors = $processors;
}
src/Appwrite/Platform/Tasks/Restore.php
-3
View File
@@ -316,9 +316,6 @@ class Restore extends Action
$processors = str_replace(PHP_EOL, '', $stdout);
$processors = empty($processors) ? 1 : intval($processors);
//$this->processors = \max(1, $processors - 2);
// todo: Using all processors was with no errors
$this->processors = $processors;
}