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

chore: refactor code

Browse Source
This commit is contained in:
Christy Jacob
2023-10-25 01:10:00 +04:00
parent fe8d8a6475
commit bf1db0dced
7 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+1 -3
View File
@@ -98,6 +98,4 @@ _APP_VCS_GITHUB_CLIENT_SECRET=
_APP_VCS_GITHUB_WEBHOOK_SECRET=
_APP_MIGRATIONS_FIREBASE_CLIENT_ID=
_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=
_APP_ASSISTANT_OPENAI_API_KEY=
_APP_CONNECTIONS_DB_REPLICAS=db_fra1_03=mariadb://root:rootsecretpassword@mariadb:3306/appwrite
_APP_CONNECTIONS_BACKUPS_STORAGE=dospaces://ACCESS:SECRET@default/backups-v1?region=fra1
_APP_ASSISTANT_OPENAI_API_KEY=
Dockerfile
+2 -3
View File
@@ -74,9 +74,8 @@ RUN mkdir -p /storage/uploads && \
# Executables
RUN chmod +x /usr/local/bin/doctor && \
chmod +x /usr/local/bin/maintenance && \
chmod +x /usr/local/bin/db-backup && \
chmod +x /usr/local/bin/db-restore && \
chmod +x /usr/local/bin/volume-sync && \
chmod +x /usr/local/bin/database-backup && \
chmod +x /usr/local/bin/database-restore && \
chmod +x /usr/local/bin/usage && \
chmod +x /usr/local/bin/install && \
chmod +x /usr/local/bin/upgrade && \
app/init.php
-6
View File
@@ -614,12 +614,6 @@ $register->set('pools', function () {
'multiple' => true,
'schemes' => ['mariadb', 'mysql'],
],
'replica' => [
'type' => 'database',
'dsns' => App::getEnv('_APP_CONNECTIONS_DB_REPLICAS', $fallbackForDB),
'multiple' => true,
'schemes' => ['mariadb', 'mysql'],
],
'queue' => [
'type' => 'queue',
'dsns' => App::getEnv('_APP_CONNECTIONS_QUEUE', $fallbackForRedis),
bin/db-backup → bin/database-backup
View File
bin/db-restore → bin/database-restore
View File
docker-compose.yml
+4 -2
View File
@@ -834,8 +834,8 @@ services:
appwrite-backup:
image: appwrite-dev
<<: *x-logging
entrypoint: db-backup
container_name: appwrite-backup
command: database-backup --database=db_fra1_03
networks:
- appwrite
volumes:
@@ -846,6 +846,8 @@ services:
depends_on:
- redis
environment:
- _APP_BACKUPS_INTERVAL=120
- _APP_BACKUPS_START_TIME=21:08
- _APP_CONNECTIONS_DB_REPLICAS
- _APP_CONNECTIONS_BACKUPS_STORAGE
- _APP_LOGGING_PROVIDER
@@ -853,7 +855,7 @@ services:
appwrite-restore:
command: sleep infinity
container_name: appwrite-backup-restore
container_name: appwrite-restore
image: appwrite-dev
networks:
- appwrite
src/Appwrite/Platform/Tasks/Backup.php
+67 -29
View File
@@ -3,11 +3,16 @@
namespace Appwrite\Platform\Tasks;
use Exception;
use PDO;
use Utopia\DSN\DSN;
use Utopia\Platform\Action;
use Utopia\App;
use Utopia\Cache\Adapter\None;
use Utopia\Cache\Cache;
use Utopia\CLI\Console;
use Utopia\Pools\Group;
use Utopia\Database\Adapter\MariaDB;
use Utopia\Database\Adapter\MySQL;
use Utopia\Database\Database;
use Utopia\Storage\Device;
use Utopia\Storage\Device\DOSpaces;
use Utopia\Storage\Device\Local;
@@ -25,6 +30,7 @@ class Backup extends Action
public const RETRY_TAR = 1;
public const RETRY_UPLOAD = 2;
public const VERSION = 'v1';
protected ?DSN $dsn = null;
protected ?string $database = null;
protected ?DOSpaces $s3 = null;
@@ -39,49 +45,78 @@ class Backup extends Action
$this
->desc('Backup a database')
->param('database', null, new Text(20), 'Database name, for example: db_fra1_03')
->inject('pools')
->inject('logError')
->callback(fn(string $database, Group $pools, callable $logError) => $this->action($database, $pools, $logError));
}
public static function getName(): string
{
return 'backup';
->callback(fn (string $database, callable $logError) => $this->action($database, $logError));
}
/**
* @throws Exception
*/
public function action(string $database, Group $pools, callable $logError): void
public function action(string $database, callable $logError): void
{
$this->checkEnvVariables();
Console::title('Backups V1');
Console::success(APP_NAME . ' Database Backup Process has started..');
$this->database = $database;
$this->checkEnvVariables();
$this->dsn = $this->getDsn($database);
if (is_null($this->dsn)) {
throw new Exception('No DSN match');
throw new Exception('No DSN found for database ' . $database . '. Check the value of _APP_CONNECTIONS_DB_REPLICAS');
}
console::info('Trying to connect to ' . $this->dsn->getHost());
$dsn = new DSN(App::getEnv('_APP_CONNECTIONS_BACKUPS_STORAGE', ''));
$this->s3 = new DOSpaces('/' . $database . '/' . self::VERSION, $dsn->getUser(), $dsn->getPassword(), $dsn->getPath(), $dsn->getParam('region'));
Console::info('Trying to connect to ' . $this->dsn->getHost());
try {
$this->retry(function () use ($pools, $database) {
$pools
->get('replica_' . $database)
->pop()
->getResource();
$this->retry(function () {
$dsnHost = $this->dsn->getHost();
$dsnPort = $this->dsn->getPort();
$dsnUser = $this->dsn->getUser();
$dsnPass = $this->dsn->getPassword();
$dsnScheme = $this->dsn->getScheme();
$dsnDatabase = $this->dsn->getPath();
$pdo = new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass);
$adapter = match ($dsnScheme) {
'mysql' => new MySQL($pdo),
'mariadb' => new MariaDB($pdo)
};
$database = new Database($adapter, new Cache(new None()));
$database->ping();
Console::success('Connected to ' . $dsnHost);
}, 10, 5);
} catch (Exception $error) {
throw new Exception('Failed to connect to database: ' . $error->getMessage());
}
$storageDSN = new DSN(App::getEnv('_APP_CONNECTIONS_BACKUPS_STORAGE', ''));
$this->s3 = new DOSpaces('/' . $database . '/' . self::VERSION, $storageDSN->getUser(), $storageDSN->getPassword(), $storageDSN->getPath(), $storageDSN->getParam('region'));
$this->setContainerId();
$this->setProcessors();
$sleep = (int) App::getEnv('_APP_BACKUPS_INTERVAL', 0); // 120 seconds (by default)
$jobInitTime = App::getEnv('_APP_BACKUPS_START_TIME'); // (hour:minutes)
if (!$sleep || !$jobInitTime) {
throw new Exception('Invalid backup interval or start time');
}
$now = new \DateTime();
$now->setTimezone(new \DateTimeZone(date_default_timezone_get()));
$next = new \DateTime($now->format("Y-m-d $jobInitTime"));
$next->setTimezone(new \DateTimeZone(date_default_timezone_get()));
$delay = $next->getTimestamp() - $now->getTimestamp();
/**
* If time passed for the target day.
*/
if ($delay <= 0) {
$next->add(\DateInterval::createFromDateString('1 days'));
$delay = $next->getTimestamp() - $now->getTimestamp();
}
self::log('Setting loop start time to ' . $next->format("Y-m-d H:i:s.v") . '. Delaying for ' . $delay . ' seconds.');
Console::loop(function () use ($logError) {
try {
$this->start();
@@ -93,7 +128,7 @@ class Backup extends Action
$logError($error, 'backup', 'action');
}
}, self::BACKUP_INTERVAL_SECONDS);
}, $sleep, $delay);
}
/**
@@ -248,12 +283,10 @@ class Backup extends Action
*/
public function checkEnvVariables(): void
{
foreach (
[
'_APP_CONNECTIONS_BACKUPS_STORAGE',
'_APP_CONNECTIONS_DB_REPLICAS',
] as $env
) {
foreach ([
'_APP_CONNECTIONS_BACKUPS_STORAGE',
'_APP_CONNECTIONS_DB_REPLICAS',
] as $env) {
if (empty(App::getEnv($env))) {
throw new Exception('Can\'t read ' . $env);
}
@@ -413,4 +446,9 @@ class Backup extends Action
return false;
}
public static function getName(): string
{
return 'backup';
}
}