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

Optimize backup and restore functions in backup plugin

Browse source
This commit is contained in:
Théophile Diot 2024-04-04 13:16:23 +01:00
parent 00bda06737
commit ed389185c8
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/core/backup/bwcli/restore.py
View file

@ -52,10 +52,10 @@ try:
current_time = datetime.now()
tmp_backup_dir = Path(sep, "tmp", "bunkerweb", "backups")
tmp_backup_dir.mkdir(parents=True, exist_ok=True)
backup_database(current_time, tmp_backup_dir)
db = backup_database(current_time, backup_dir=tmp_backup_dir)
LOGGER.info(f"Restoring backup {backup_file} ...")
restore_database(backup_file)
restore_database(backup_file, db)
except SystemExit as se:
status = se.code
except:

2
src/common/core/backup/jobs/backup-data.py
View file

@ -55,7 +55,7 @@ try:
LOGGER.info("First start of the scheduler, skipping backup ...")
sys_exit(0)
backup_database(current_time)
backup_database(current_time, JOB.db, backup_dir)
backup_rotation = int(getenv("BACKUP_ROTATION", "7"))

10
src/common/core/backup/utils.py
View file

@ -38,9 +38,9 @@ def acquire_db_lock():
DB_LOCK_FILE.touch()
def backup_database(current_time: datetime, backup_dir: Path = BACKUP_DIR):
def backup_database(current_time: datetime, db: Database = None, backup_dir: Path = BACKUP_DIR) -> Database:
"""Backup the database."""
db = Database(LOGGER)
db = db or Database(LOGGER)
database: Literal["sqlite", "mariadb", "mysql", "postgresql"] = db.database_uri.split(":")[0].split("+")[0] # type: ignore
backup_file = backup_dir.joinpath(f"backup-{database}-{current_time.strftime('%Y-%m-%d_%H-%M-%S')}.zip")
@ -104,11 +104,12 @@ def backup_database(current_time: datetime, backup_dir: Path = BACKUP_DIR):
LOGGER.error(f"Failed to update the backup.json cache file: {err}")
LOGGER.info(f"💾 Backup {backup_file.name} created successfully in {backup_dir}")
return db
def restore_database(backup_file: Path):
def restore_database(backup_file: Path, db: Database = None) -> Database:
"""Restore the database from a backup."""
db = Database(LOGGER)
db = db or Database(LOGGER)
Base.metadata.drop_all(db.sql_engine)
database: Literal["sqlite", "mariadb", "mysql", "postgresql"] = db.database_uri.split(":")[0].split("+")[0] # type: ignore
@ -183,3 +184,4 @@ def restore_database(backup_file: Path):
LOGGER.error(f"Error while applying changes to the database: {err}, you may need to reload the application")
LOGGER.info(f"💾 Database restored successfully from {backup_file}")
return db