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

fix: backup error output

Browse Source
This commit is contained in:
Jonas Kaninda
2025-03-12 13:27:31 +01:00
parent 696477fe5c
commit 489dfdf842
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/backup.go
View File

@@ -26,6 +26,7 @@ SOFTWARE.
package pkg package pkg
import ( import (
"errors"
"fmt" "fmt"
"github.com/jkaninda/encryptor" "github.com/jkaninda/encryptor"
"github.com/jkaninda/go-storage/pkg/local" "github.com/jkaninda/go-storage/pkg/local"
@@ -207,7 +208,7 @@ func BackupDatabase(db *dbConfig, backupFileName string, disableCompression bool
} }
err = testDatabaseConnection(db) err = testDatabaseConnection(db)
if err != nil { if err != nil {
return fmt.Errorf("failed to connect to the database: %v", err) return errors.New(err.Error())
} }
// Backup Database database // Backup Database database
utils.Info("Backing up database...") utils.Info("Backing up database...")
@@ -223,7 +224,7 @@ func BackupDatabase(db *dbConfig, backupFileName string, disableCompression bool
) )
output, err := cmd.Output() output, err := cmd.Output()
if err != nil { if err != nil {
return fmt.Errorf("failed to backup database: %v", err) return fmt.Errorf("failed to backup database: %v output: %v", err, output)
} }
// save output // save output
@@ -249,7 +250,7 @@ func BackupDatabase(db *dbConfig, backupFileName string, disableCompression bool
cmd := exec.Command("mysqldump", "-h", db.dbHost, "-P", db.dbPort, "-u", db.dbUserName, db.dbName) cmd := exec.Command("mysqldump", "-h", db.dbHost, "-P", db.dbPort, "-u", db.dbUserName, db.dbName)
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {
return fmt.Errorf("failed to backup database: %v", err) return fmt.Errorf("failed to backup database: %v output: %v", err, stdout)
} }
gzipCmd := exec.Command("gzip") gzipCmd := exec.Command("gzip")
gzipCmd.Stdin = stdout gzipCmd.Stdin = stdout
@@ -358,8 +359,9 @@ func recoverMode(err error, msg string) {
utils.Error("Backup rescue mode is enabled") utils.Error("Backup rescue mode is enabled")
utils.Error("Backup will continue") utils.Error("Backup will continue")
} else { } else {
utils.Error("Error: %s", msg) utils.Error("Error 10: %s", msg)
utils.Fatal("Error: %v", err) utils.Fatal("Error 10: %v", err)
return
} }
} }

26
pkg/helper.go
View File

@@ -65,25 +65,28 @@ func deleteTemp() {
} }
} }
// TestDatabaseConnection tests the database connection // TestDatabaseConnection tests the database connection
func testDatabaseConnection(db *dbConfig) error { func testDatabaseConnection(db *dbConfig) error {
err := os.Setenv("MYSQL_PWD", db.dbPassword) // Set the MYSQL_PWD environment variable
if err != nil { if err := os.Setenv("MYSQL_PWD", db.dbPassword); err != nil {
return fmt.Errorf("failed to set MYSQL_PWD environment variable: %v", err) return fmt.Errorf("failed to set MYSQL_PWD environment variable: %v", err)
} }
utils.Info("Connecting to %s database ...", db.dbName) utils.Info("Connecting to %s database ...", db.dbName)
// Set database name for notification error // Set database name for notification error
utils.DatabaseName = db.dbName utils.DatabaseName = db.dbName
// Prepare the command to test the database connection
cmd := exec.Command("mariadb", "-h", db.dbHost, "-P", db.dbPort, "-u", db.dbUserName, db.dbName, "-e", "quit") cmd := exec.Command("mariadb", "-h", db.dbHost, "-P", db.dbPort, "-u", db.dbUserName, db.dbName, "-e", "quit")
// Capture the output // Capture the output
var out bytes.Buffer var out bytes.Buffer
cmd.Stdout = &out cmd.Stdout = &out
cmd.Stderr = &out cmd.Stderr = &out
err = cmd.Run()
if err != nil {
return fmt.Errorf("failed to connect to %s database: %v", db.dbName, err)
// Run the command
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to connect to database %s: %v, output: %s", db.dbName, err, out.String())
} }
utils.Info("Successfully connected to %s database", db.dbName) utils.Info("Successfully connected to %s database", db.dbName)
return nil return nil
} }
@@ -183,3 +186,14 @@ func RemoveLastExtension(filename string) string {
} }
return filename return filename
} }
// Create mysql client config file
func createMysqlClientConfigFile(db dbConfig) error {
// Create the mysql client config file
mysqlClientConfigFile := filepath.Join(tmpPath, "my.cnf")
mysqlClientConfig := fmt.Sprintf("[client]\nhost=%s\nport=%s\nuser=%s\npassword=%s\nssl-ca=%s\nssl=0\n", db.dbHost, db.dbPort, db.dbUserName, db.dbPassword, db.caCertPath)
if err := os.WriteFile(mysqlClientConfigFile, []byte(mysqlClientConfig), 0644); err != nil {
return fmt.Errorf("failed to create mysql client config file: %v", err)
}
return nil
}