From 3f5535aa972c7f3d240806202b7aa0a8696832c1 Mon Sep 17 00:00:00 2001 From: woblerr Date: Thu, 17 Aug 2023 21:20:04 +0300 Subject: [PATCH] Use only one set of constants. --- cmd/backup_delete.go | 14 +++++++------- cmd/backup_info.go | 12 ++++++------ cmd/constants.go | 4 ---- cmd/wrapers.go | 2 +- gpbckpconfig/struct.go | 8 ++++---- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/cmd/backup_delete.go b/cmd/backup_delete.go index d0ef5fa..0e75391 100644 --- a/cmd/backup_delete.go +++ b/cmd/backup_delete.go @@ -188,9 +188,9 @@ func backupDeleteDBPluginFunc(backupName string, backupData gpbckpconfig.BackupC gplog.Error(stderr) } if errdel != nil { - err = updateDeleteStatus(backupName, deleteStatusPluginFailed, hDB) + err = updateDeleteStatus(backupName, gpbckpconfig.DateDeletedPluginFailed, hDB) if err != nil { - gplog.Error(errtext.ErrorTextUnableSetBackupStatus(deleteStatusPluginFailed, backupName, err)) + gplog.Error(errtext.ErrorTextUnableSetBackupStatus(gpbckpconfig.DateDeletedPluginFailed, backupName, err)) } gplog.Error(errtext.ErrorTextUnableDeleteBackup(backupName, errdel)) return errdel @@ -202,7 +202,7 @@ func backupDeleteDBPluginFunc(backupName string, backupData gpbckpconfig.BackupC return errdel } } else { - if backupDateDeleted == deleteStatusInProgress { + if backupDateDeleted == gpbckpconfig.DateDeletedInProgress { gplog.Warn(errtext.ErrorTextBackupInProgress(backupName, errtext.ErrorBackupDeleteInProgressError())) return errtext.ErrorBackupDeleteInProgressError() } else { @@ -296,21 +296,21 @@ func backupDeleteFilePluginFunc(backupData gpbckpconfig.BackupConfig, parseHData gplog.Error(stderr) } if errdel != nil { - err = parseHData.UpdateBackupConfigDateDeleted(backupData.Timestamp, deleteStatusPluginFailed) + err = parseHData.UpdateBackupConfigDateDeleted(backupData.Timestamp, gpbckpconfig.DateDeletedPluginFailed) if err != nil { - gplog.Error(errtext.ErrorTextUnableSetBackupStatus(deleteStatusPluginFailed, backupData.Timestamp, err)) + gplog.Error(errtext.ErrorTextUnableSetBackupStatus(gpbckpconfig.DateDeletedPluginFailed, backupData.Timestamp, err)) } gplog.Error(errtext.ErrorTextUnableDeleteBackup(backupData.Timestamp, errdel)) return errdel } gplog.Info(stdout) - err = parseHData.UpdateBackupConfigDateDeleted(backupData.Timestamp, deleteStatusPluginFailed) + err = parseHData.UpdateBackupConfigDateDeleted(backupData.Timestamp, gpbckpconfig.DateDeletedPluginFailed) if err != nil { gplog.Error(errtext.ErrorTextUnableSetBackupStatus(dateDeleted, backupData.Timestamp, err)) return err } } else { - if backupDateDeleted == deleteStatusInProgress { + if backupDateDeleted == gpbckpconfig.DateDeletedInProgress { gplog.Warn(errtext.ErrorTextBackupInProgress(backupData.Timestamp, errtext.ErrorBackupDeleteInProgressError())) return errtext.ErrorBackupDeleteInProgressError() } else { diff --git a/cmd/backup_info.go b/cmd/backup_info.go index c5c934f..0c70d0e 100644 --- a/cmd/backup_info.go +++ b/cmd/backup_info.go @@ -166,18 +166,18 @@ func getBackupNames(showD, showF, sAll bool, historyDB *sql.DB) ([]string, error case showD: getBackupsQuery += " WHERE status != '" + failureStatus + "'" + " AND date_deleted NOT IN ('', '" + - deleteStatusInProgress + "', '" + - deleteStatusPluginFailed + "', '" + - deleteStatusLocalFailed + "')" + orderBy + gpbckpconfig.DateDeletedInProgress + "', '" + + gpbckpconfig.DateDeletedPluginFailed + "', '" + + gpbckpconfig.DateDeletedLocalFailed + "')" + orderBy case showF: getBackupsQuery += " WHERE status = '" + failureStatus + "'" + orderBy default: getBackupsQuery += " WHERE status != '" + failureStatus + "'" + " AND date_deleted IN ('', '" + - deleteStatusInProgress + "', '" + - deleteStatusPluginFailed + "', '" + - deleteStatusLocalFailed + "')" + orderBy + gpbckpconfig.DateDeletedInProgress + "', '" + + gpbckpconfig.DateDeletedPluginFailed + "', '" + + gpbckpconfig.DateDeletedLocalFailed + "')" + orderBy } backupListRow, err := historyDB.Query(getBackupsQuery) if err != nil { diff --git a/cmd/constants.go b/cmd/constants.go index 3a27d77..fd87f80 100644 --- a/cmd/constants.go +++ b/cmd/constants.go @@ -5,10 +5,6 @@ const ( deleteBackupPluginCommand = "delete_backup" - deleteStatusInProgress = "In progress" - deleteStatusPluginFailed = "Plugin Backup Delete Failed" - deleteStatusLocalFailed = "Local Delete Failed" - failureStatus = "Failure" historyFileNameBaseConst = "gpbackup_history" diff --git a/cmd/wrapers.go b/cmd/wrapers.go index 5292d9f..9b70ba5 100644 --- a/cmd/wrapers.go +++ b/cmd/wrapers.go @@ -115,7 +115,7 @@ func getCurrentTimestamp() string { } func isBackupActive(dateDeleted string) bool { - return (dateDeleted != "" || dateDeleted == deleteStatusPluginFailed || dateDeleted == deleteStatusLocalFailed) + return (dateDeleted != "" || dateDeleted == gpbckpconfig.DateDeletedPluginFailed || dateDeleted == gpbckpconfig.DateDeletedLocalFailed) } func checkFullPath(path string) error { diff --git a/gpbckpconfig/struct.go b/gpbckpconfig/struct.go index 035a8a4..f1af51e 100644 --- a/gpbckpconfig/struct.go +++ b/gpbckpconfig/struct.go @@ -67,9 +67,9 @@ const ( objectFilteringIncludeTable = "include-table" objectFilteringExcludeTable = "exclude-table" // Date deleted types. - dateDeletedInProgress = "In progress" - dateDeletedPluginFailed = "Plugin Backup Delete Failed" - dateDeletedLocalFailed = "Local Delete Failed" + DateDeletedInProgress = "In progress" + DateDeletedPluginFailed = "Plugin Backup Delete Failed" + DateDeletedLocalFailed = "Local Delete Failed" ) // GetBackupType Get backup type. @@ -178,7 +178,7 @@ func (backupConfig BackupConfig) GetBackupDuration() (float64, error) { // In all other cases, an error is returned. func (backupConfig BackupConfig) GetBackupDateDeleted() (string, error) { switch backupConfig.DateDeleted { - case "", dateDeletedInProgress, dateDeletedPluginFailed, dateDeletedLocalFailed: + case "", DateDeletedInProgress, DateDeletedPluginFailed, DateDeletedLocalFailed: return backupConfig.DateDeleted, nil default: t, err := time.Parse(Layout, backupConfig.DateDeleted)