Merge branch 'release/0.2.1'

syaiful6 · May 10, 2023 · d3e6c35 · d3e6c35
2 parents 3e1082f + d94afd5
commit d3e6c35
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -30,11 +30,7 @@ This project has beed forked from [gobackup](https://github.com/huacnlee/gobacku
 
 ## Installation
 
-Currently we don't provides binary release, you need to compile it from source yourself.
-
-- Clone this repository: `git clone https://github.com/syaiful6/payung.git`
-- Build the binary: `make build`
-- Copy the output binary: `payung` to your PATH: `sudo cp payung /usr/local/bin`
+You can download our current build in this repository's [release page](https://github.com/syaiful6/payung/releases) and place executable in your $PATH, ie: `/usr/local/bin/`.
 
 ## Configuration
 

diff --git a/database/mariabackup.go b/database/mariabackup.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"bufio"
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -169,14 +170,16 @@ func (ctx *MariaBackup) takeBackup(options []string) error {
 	if err != nil {
 		return fmt.Errorf("-> Create dump command line error: %s", err)
 	}
+	var errOut bytes.Buffer
+	mariabackup.Stderr = &errOut
 	stdoutPipe, err := mariabackup.StdoutPipe()
 	if err != nil {
 		return fmt.Errorf("-> Can't pipe stdout error: %s", err)
 	}
 
 	err = mariabackup.Start()
 	if err != nil {
-		return fmt.Errorf("-> can't start mariabackup error: %s", err)
+		return fmt.Errorf("-> can't start mariabackup error: %s. stderr: %s", err, errOut.String())
 	}
 	dumpFilePath := path.Join(ctx.dumpPath, "mariabackup.xb")
 	ext, r, err := compressor.CompressTo(ctx.model, bufio.NewReader(stdoutPipe))
@@ -186,7 +189,7 @@ func (ctx *MariaBackup) takeBackup(options []string) error {
 	dumpFilePath = dumpFilePath + ext
 	f, err := os.Create(dumpFilePath)
 	if err != nil {
-		return fmt.Errorf("-> error: can't create file for database dump: %s", err)
+		return fmt.Errorf("-> error: can't create file for database dump: %s, stderr:", err)
 	}
 	defer f.Close()
 	_, err = io.Copy(f, r)
@@ -195,7 +198,7 @@ func (ctx *MariaBackup) takeBackup(options []string) error {
 	}
 
 	if err = mariabackup.Wait(); err != nil {
-		return fmt.Errorf("-> Dump error: %s", err)
+		return fmt.Errorf("-> Dump error: %s, stderr: %s", err, errOut.String())
 	}
 
 	logger.Info("dump path:", ctx.dumpPath)

diff --git a/database/mysql.go b/database/mysql.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -86,6 +87,8 @@ func (ctx *MySQL) dump() error {
 	if err != nil {
 		return fmt.Errorf("-> Create dump command line error: %s", err)
 	}
+	var errOut bytes.Buffer
+	mysqldump.Stderr = &errOut
 	stdoutPipe, err := mysqldump.StdoutPipe()
 	if err != nil {
 		return fmt.Errorf("-> Can't pipe stdout error: %s", err)
@@ -113,7 +116,7 @@ func (ctx *MySQL) dump() error {
 	}
 
 	if err = mysqldump.Wait(); err != nil {
-		return fmt.Errorf("-> Dump error: %s", err)
+		return fmt.Errorf("-> Dump error: %s, stderr: %s", err, errOut.String())
 	}
 
 	logger.Info("dump path:", ctx.dumpPath)

diff --git a/database/postgresql.go b/database/postgresql.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -82,6 +83,8 @@ func (ctx *PostgreSQL) dump() error {
 	if err != nil {
 		return err
 	}
+	var errOut bytes.Buffer
+	pgDump.Stderr = &errOut
 	stdoutPipe, err := pgDump.StdoutPipe()
 	if err != nil {
 		return fmt.Errorf("-> Can't pipe stdout error: %s", err)
@@ -109,7 +112,7 @@ func (ctx *PostgreSQL) dump() error {
 	}
 
 	if err = pgDump.Wait(); err != nil {
-		return fmt.Errorf("-> Dump error: %s", err)
+		return fmt.Errorf("-> Dump error: %s, stderr: %s", err, errOut.String())
 	}
 
 	logger.Info("dump path:", ctx.dumpPath)

diff --git a/model/model.go b/model/model.go
@@ -88,6 +88,8 @@ func (ctx Model) run() (err error) {
 		return
 	}
 
+	ctx.cleanUpDump()
+
 	err = storage.Run(ctx.Config, backupPackage)
 	if err != nil {
 		logger.Error(err)
@@ -97,6 +99,14 @@ func (ctx Model) run() (err error) {
 	return
 }
 
+func (ctx Model) cleanUpDump() {
+	logger.Info("Cleanup dump folder: " + ctx.Config.DumpPath + "/\n")
+	err := os.RemoveAll(ctx.Config.DumpPath)
+	if err != nil {
+		logger.Error("Cleanup temp dir "+ctx.Config.DumpPath+" error:", err)
+	}
+}
+
 // Cleanup model temp files
 func (ctx Model) cleanup() {
 	logger.Info("Cleanup temp: " + ctx.Config.TempPath + "/\n")