diff --git a/pkg/backup.go b/pkg/backup.go index 3c45164..68034ef 100644 --- a/pkg/backup.go +++ b/pkg/backup.go @@ -117,6 +117,9 @@ func createBackupTask(db *dbConfig, config *BackupConfig) { if config.all && !config.allInOne { backupAll(db, config) } else { + if db.dbName == "" && !config.all { + utils.Fatal("Database name is required, use DB_NAME environment variable or -d flag") + } backupTask(db, config) } } @@ -249,8 +252,10 @@ func BackupDatabase(db *dbConfig, backupFileName string, disableCompression, all dumpArgs := []string{fmt.Sprintf("--defaults-file=%s", mysqlClientConfig)} if all && singleFile { + utils.Info("Backing up all databases...") dumpArgs = append(dumpArgs, "--all-databases", "--single-transaction", "--routines", "--triggers") } else { + utils.Info("Backing up %s database...", db.dbName) dumpArgs = append(dumpArgs, db.dbName) } diff --git a/pkg/config.go b/pkg/config.go index c6a40e7..64ccda3 100644 --- a/pkg/config.go +++ b/pkg/config.go @@ -251,12 +251,10 @@ func initBackupConfig(cmd *cobra.Command) *BackupConfig { utils.GetEnv(cmd, "cron-expression", "BACKUP_CRON_EXPRESSION") utils.GetEnv(cmd, "path", "REMOTE_PATH") utils.GetEnv(cmd, "config", "BACKUP_CONFIG_FILE") - utils.GetEnv(cmd, "dbname", "DB_NAME") // Get flag value and set env remotePath := utils.GetEnvVariable("REMOTE_PATH", "SSH_REMOTE_PATH") storage = utils.GetEnv(cmd, "storage", "STORAGE") prune := false - configFile := os.Getenv("BACKUP_CONFIG_FILE") backupRetention := utils.GetIntEnv("BACKUP_RETENTION_DAYS") if backupRetention > 0 { prune = true @@ -281,10 +279,6 @@ func initBackupConfig(cmd *cobra.Command) *BackupConfig { encryption = true usingKey = false } - dbName := os.Getenv("DB_NAME") - if dbName == "" && !all && configFile == "" { - utils.Fatal("Database name is required, use DB_NAME environment variable or -d flag") - } // Initialize backup configs config := BackupConfig{} config.backupRetention = backupRetention