jkaninda/mysql-bkup
1
1
Fork 0
mirror of https://github.com/jkaninda/mysql-bkup.git synced 2025-12-06 13:39:41 +01:00
Code Issues Actions Projects Releases Wiki Activity

refactor: clean up code

Browse Source
This commit is contained in:
Jonas Kaninda
2024-10-21 08:22:06 +02:00
parent dc20ea9635
commit f3ec395e37
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/backup.go
View File

@@ -195,7 +195,7 @@ func BackupDatabase(db *dbConfig, backupFileName string, disableCompression bool
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
utils.Done("Database has been backed up") utils.Info("Database has been backed up")
} else { } else {
// Execute mysqldump // Execute mysqldump
@@ -217,7 +217,7 @@ func BackupDatabase(db *dbConfig, backupFileName string, disableCompression bool
if err := gzipCmd.Wait(); err != nil { if err := gzipCmd.Wait(); err != nil {
log.Fatal(err) log.Fatal(err)
} }
utils.Done("Database has been backed up") utils.Info("Database has been backed up")
} }
@@ -301,7 +301,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
utils.Fatal("Error deleting old backup from S3: %s ", err) 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 //Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
@@ -353,7 +353,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 //Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,
@@ -405,7 +405,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 //Send notification
utils.NotifySuccess(&utils.NotificationData{ utils.NotifySuccess(&utils.NotificationData{
File: finalFileName, File: finalFileName,

6
pkg/helper.go
View File

@@ -39,7 +39,7 @@ func moveToBackup(backupFileName string, destinationPath string) {
fmt.Println("Error deleting file:", err) fmt.Println("Error deleting file:", 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) { func deleteOldBackup(retentionDays int) {
utils.Info("Deleting old backups...") utils.Info("Deleting old backups...")
@@ -54,7 +54,7 @@ func deleteOldBackup(retentionDays int) {
if err != nil { if err != nil {
utils.Fatal(fmt.Sprintf("Error: %s", err)) utils.Fatal(fmt.Sprintf("Error: %s", err))
} else { } else {
utils.Done("File %s has been deleted successfully", filePath) utils.Info("File %s has been deleted successfully", filePath)
} }
return err return err
} }
@@ -81,7 +81,7 @@ func deleteOldBackup(retentionDays int) {
utils.Fatal(fmt.Sprintf("Error: %s", err)) utils.Fatal(fmt.Sprintf("Error: %s", err))
return return
} }
utils.Done("Deleting old backups...done") utils.Info("Deleting old backups...done")
} }
func deleteTemp() { func deleteTemp() {

4
pkg/restore.go
View File

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

9
pkg/s3.go
View File

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

9
utils/logger.go
View File

@@ -41,15 +41,6 @@ func Error(msg string, args ...any) {
fmt.Printf("%s ERROR: %s\n", currentTime, formattedMessage) fmt.Printf("%s ERROR: %s\n", currentTime, formattedMessage)
} }
} }
func Done(msg string, args ...any) {
var currentTime = time.Now().Format("2006/01/02 15:04:05")
formattedMessage := fmt.Sprintf(msg, args...)
if len(args) == 0 {
fmt.Printf("%s INFO: %s\n", currentTime, msg)
} else {
fmt.Printf("%s INFO: %s\n", currentTime, formattedMessage)
}
}
// Fatal logs an error message and exits the program // Fatal logs an error message and exits the program
func Fatal(msg string, args ...any) { func Fatal(msg string, args ...any) {