From 13ada9c849314ba5fdb68cbf958342c0a5175fb2 Mon Sep 17 00:00:00 2001 From: Maddie Zhan Date: Mon, 7 Nov 2016 15:34:42 +0800 Subject: [PATCH] Log CombinedOutput instead of just Output `Output()` only shows the messages written to `stdout` but not `stderr`. Switching to `CombinedOutput()` would log both `stdout` and `stderr` to `result.Error.CmdOutput`. --- mysql.go | 4 ++-- postgres.go | 2 +- rethinkdb.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql.go b/mysql.go index 540dad7..5d30e2f 100644 --- a/mysql.go +++ b/mysql.go @@ -38,14 +38,14 @@ func (x MySQL) Export() *ExportResult { dumpPath := fmt.Sprintf(`bu_%v_%v.sql`, x.DB, time.Now().Unix()) options := append(x.dumpOptions(), fmt.Sprintf(`-r%v`, dumpPath)) - out, err := exec.Command(MysqlDumpCmd, options...).Output() + out, err := exec.Command(MysqlDumpCmd, options...).CombinedOutput() if err != nil { result.Error = makeErr(err, string(out)) return result } result.Path = dumpPath + ".tar.gz" - _, err = exec.Command(TarCmd, "-czf", result.Path, dumpPath).Output() + _, err = exec.Command(TarCmd, "-czf", result.Path, dumpPath).CombinedOutput() if err != nil { result.Error = makeErr(err, string(out)) return result diff --git a/postgres.go b/postgres.go index 46b4a08..7bbe25b 100644 --- a/postgres.go +++ b/postgres.go @@ -31,7 +31,7 @@ func (x Postgres) Export() *ExportResult { result := &ExportResult{MIME: "application/x-tar"} result.Path = fmt.Sprintf(`bu_%v_%v.sql.tar.gz`, x.DB, time.Now().Unix()) options := append(x.dumpOptions(), "-Fc", fmt.Sprintf(`-f%v`, result.Path)) - out, err := exec.Command(PGDumpCmd, options...).Output() + out, err := exec.Command(PGDumpCmd, options...).CombinedOutput() if err != nil { result.Error = makeErr(err, string(out)) } diff --git a/rethinkdb.go b/rethinkdb.go index 3c69cd1..e21e35b 100644 --- a/rethinkdb.go +++ b/rethinkdb.go @@ -32,7 +32,7 @@ func (x RethinkDB) Export() *ExportResult { result := &ExportResult{MIME: "application/x-tar"} result.Path = fmt.Sprintf(`bu_%v_%v.tar.gz`, x.Name, time.Now().Unix()) options := append(x.dumpOptions(), fmt.Sprintf(`-f%v`, result.Path)) - out, err := exec.Command(RethinkCmd, options...).Output() + out, err := exec.Command(RethinkCmd, options...).CombinedOutput() if err != nil { result.Error = makeErr(err, string(out)) }