From 6362dbe51ab56e697322f7bc39f1800a8859f52a Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Sun, 10 Sep 2017 08:20:01 +0300 Subject: [PATCH 1/3] Clearer error message on config file read error --- go/base/context.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/base/context.go b/go/base/context.go index fff040e..71bb3d0 100644 --- a/go/base/context.go +++ b/go/base/context.go @@ -700,7 +700,7 @@ func (this *MigrationContext) ReadConfigFile() error { gcfg.RelaxedParserMode = true gcfgscanner.RelaxedScannerMode = true if err := gcfg.ReadFileInto(&this.config, this.ConfigFile); err != nil { - return err + return fmt.Errorf("Error reading config file %s. Details: %s", this.ConfigFile, err.Error()) } // We accept user & password in the form "${SOME_ENV_VARIABLE}" in which case we pull From 52f2dd7a203305ff52741fa3cdc060e506bc5a9f Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Thu, 14 Sep 2017 09:51:12 +0300 Subject: [PATCH 2/3] release v1.0.42 --- RELEASE_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_VERSION b/RELEASE_VERSION index 42de374..4ad595c 100644 --- a/RELEASE_VERSION +++ b/RELEASE_VERSION @@ -1 +1 @@ -1.0.40 +1.0.42 From 351bfe1a24014c522987bb2dc967fcd7b46cbe88 Mon Sep 17 00:00:00 2001 From: dcadevil Date: Thu, 21 Sep 2017 11:36:27 +0800 Subject: [PATCH 3/3] Correct spelling for initiateStreaming() comment. --- go/logic/migrator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/logic/migrator.go b/go/logic/migrator.go index 9a020e9..9bc3a40 100644 --- a/go/logic/migrator.go +++ b/go/logic/migrator.go @@ -915,7 +915,7 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) { } } -// initiateStreaming begins treaming of binary log events and registers listeners for such events +// initiateStreaming begins streaming of binary log events and registers listeners for such events func (this *Migrator) initiateStreaming() error { this.eventsStreamer = NewEventsStreamer() if err := this.eventsStreamer.InitDBConnections(); err != nil {