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

refactor: clean up code

Browse Source
This commit is contained in:
Jonas Kaninda
2024-10-21 08:02:57 +02:00
parent 0089e8ed6d
commit 01c5a061c5
5 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/backup.go
View File

@@ -308,7 +308,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
utils.Fatal("Error deleting old backup from S3: %s ", err)
}
}
utils.Done("Uploading backup archive to remote storage S3 ... done ")
utils.Info("Uploading backup archive to remote storage S3 ... done ")
//Send notification
utils.NotifySuccess(&utils.NotificationData{
File: finalFileName,
@@ -360,7 +360,7 @@ func sshBackup(db *dbConfig, config *BackupConfig) {
}
utils.Done("Uploading backup archive to remote storage ... done ")
utils.Info("Uploading backup archive to remote storage ... done ")
//Send notification
utils.NotifySuccess(&utils.NotificationData{
File: finalFileName,
@@ -412,7 +412,7 @@ func ftpBackup(db *dbConfig, config *BackupConfig) {
}
utils.Done("Uploading backup archive to the remote FTP server ... done ")
utils.Info("Uploading backup archive to the remote FTP server ... done ")
//Send notification
utils.NotifySuccess(&utils.NotificationData{

6
pkg/helper.go
View File

@@ -45,7 +45,7 @@ func moveToBackup(backupFileName string, destinationPath string) {
utils.Error("Error deleting file: %s", err)
}
utils.Done("Database has been backed up and copied to %s", filepath.Join(destinationPath, backupFileName))
utils.Info("Database has been backed up and copied to %s", filepath.Join(destinationPath, backupFileName))
}
func deleteOldBackup(retentionDays int) {
utils.Info("Deleting old backups...")
@@ -60,7 +60,7 @@ func deleteOldBackup(retentionDays int) {
if err != nil {
utils.Fatal("Error:", err)
} else {
utils.Done("File %s deleted successfully", filePath)
utils.Info("File %s deleted successfully", filePath)
}
return err
}
@@ -87,7 +87,7 @@ func deleteOldBackup(retentionDays int) {
utils.Fatal("Error:", err)
return
}
utils.Done("Deleting old backups...done")
utils.Info("Deleting old backups...done")
}
func deleteTemp() {
utils.Info("Deleting %s ...", tmpPath)

4
pkg/restore.go
View File

@@ -127,7 +127,7 @@ func RestoreDatabase(db *dbConfig, conf *RestoreConfig) {
utils.Fatal("Error, in restoring the database %v", err)
}
utils.Info("Restoring database... done")
utils.Done("Database has been restored")
utils.Info("Database has been restored")
//Delete temp
deleteTemp()
@@ -139,7 +139,7 @@ func RestoreDatabase(db *dbConfig, conf *RestoreConfig) {
utils.Fatal("Error in restoring the database %v", err)
}
utils.Info("Restoring database... done")
utils.Done("Database has been restored")
utils.Info("Database has been restored")
//Delete temp
deleteTemp()
} else {

9
pkg/s3.go
View File

@@ -106,6 +106,8 @@ func DownloadFile(destinationPath, key, bucket, prefix string) error {
return nil
}
func DeleteOldBackup(bucket, prefix string, retention int) error {
utils.Info("Deleting old backups...")
utils.Info("Bucket %s Prefix: %s Retention: %d", bucket, prefix, retention)
sess, err := CreateSession()
if err != nil {
return err
@@ -113,7 +115,7 @@ func DeleteOldBackup(bucket, prefix string, retention int) error {
svc := s3.New(sess)
// Get the current time and the time threshold for 7 days ago
// Get the current time
now := time.Now()
backupRetentionDays := now.AddDate(0, 0, -retention)
@@ -125,6 +127,7 @@ func DeleteOldBackup(bucket, prefix string, retention int) error {
err = svc.ListObjectsV2Pages(listObjectsInput, func(page *s3.ListObjectsV2Output, lastPage bool) bool {
for _, object := range page.Contents {
if object.LastModified.Before(backupRetentionDays) {
utils.Info("Deleting old backup: %s", *object.Key)
// Object is older than retention days, delete it
_, err := svc.DeleteObject(&s3.DeleteObjectInput{
Bucket: aws.String(bucket),
@@ -133,7 +136,7 @@ func DeleteOldBackup(bucket, prefix string, retention int) error {
if err != nil {
utils.Info("Failed to delete object %s: %v", *object.Key, err)
} else {
utils.Info("Deleted object %s\n", *object.Key)
utils.Info("Deleted object %s", *object.Key)
}
}
}
@@ -143,6 +146,6 @@ func DeleteOldBackup(bucket, prefix string, retention int) error {
utils.Error("Failed to list objects: %v", err)
}
utils.Info("Finished deleting old files.")
utils.Info("Deleting old backups...done")
return nil
}