jkaninda/pg-bkup
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

fix: fix multi backup s3 path

Browse Source
This commit is contained in:
Jonas Kaninda
2024-10-10 05:50:12 +02:00
parent 9ce8de7b0b
commit 495d2f43a1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/backup.go
View File

@@ -260,6 +260,10 @@ func localBackup(db *dbConfig, config *BackupConfig) {
func s3Backup(db *dbConfig, config *BackupConfig) { func s3Backup(db *dbConfig, config *BackupConfig) {
bucket := utils.GetEnvVariable("AWS_S3_BUCKET_NAME", "BUCKET_NAME") bucket := utils.GetEnvVariable("AWS_S3_BUCKET_NAME", "BUCKET_NAME")
s3Path := utils.GetEnvVariable("AWS_S3_PATH", "S3_PATH")
if config.remotePath != "" {
s3Path = config.remotePath
}
utils.Info("Backup database to s3 storage") utils.Info("Backup database to s3 storage")
startTime = time.Now().Format(utils.TimeFormat()) startTime = time.Now().Format(utils.TimeFormat())
//Backup database //Backup database
@@ -272,7 +276,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
utils.Info("Uploading backup archive to remote storage S3 ... ") utils.Info("Uploading backup archive to remote storage S3 ... ")
utils.Info("Backup name is %s", finalFileName) utils.Info("Backup name is %s", finalFileName)
err := UploadFileToS3(tmpPath, finalFileName, bucket, config.remotePath) err := UploadFileToS3(tmpPath, finalFileName, bucket, s3Path)
if err != nil { if err != nil {
utils.Fatal("Error uploading backup archive to S3: %s ", err) utils.Fatal("Error uploading backup archive to S3: %s ", err)
@@ -292,7 +296,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
} }
// Delete old backup // Delete old backup
if config.prune { if config.prune {
err := DeleteOldBackup(bucket, config.remotePath, config.backupRetention) err := DeleteOldBackup(bucket, s3Path, config.backupRetention)
if err != nil { if err != nil {
utils.Fatal("Error deleting old backup from S3: %s ", err) utils.Fatal("Error deleting old backup from S3: %s ", err)
} }
@@ -304,7 +308,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
BackupSize: backupSize, BackupSize: backupSize,
Database: db.dbName, Database: db.dbName,
Storage: config.storage, Storage: config.storage,
BackupLocation: filepath.Join(config.remotePath, finalFileName), BackupLocation: filepath.Join(s3Path, finalFileName),
StartTime: startTime, StartTime: startTime,
EndTime: time.Now().Format(utils.TimeFormat()), EndTime: time.Now().Format(utils.TimeFormat()),
}) })