Merge branch 'master' into nm-refactor-migration-context

nikhilmat · nikhilmat · commit f06e23282e86 · 2017-10-02T10:31:57.000-07:00
diff --git a/RELEASE_VERSION b/RELEASE_VERSION
@@ -1 +1 @@
-1.0.40
+1.0.42
diff --git a/go/base/context.go b/go/base/context.go
@@ -714,7 +714,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
diff --git a/go/logic/migrator.go b/go/logic/migrator.go
@@ -926,7 +926,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(this.migrationContext)
 	if err := this.eventsStreamer.InitDBConnections(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ func (this *MigrationContext) ReadConfigFile() error {`
`714`	`714`	`gcfg.RelaxedParserMode = true`
`715`	`715`	`gcfgscanner.RelaxedScannerMode = true`
`716`	`716`	`if err := gcfg.ReadFileInto(&this.config, this.ConfigFile); err != nil {`
`717`		`- return err`
	`717`	`+ return fmt.Errorf("Error reading config file %s. Details: %s", this.ConfigFile, err.Error())`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`// We accept user & password in the form "${SOME_ENV_VARIABLE}" in which case we pull`
Original file line number	Diff line number	Diff line change
`@@ -926,7 +926,7 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) {`
`926`	`926`	`}`
`927`	`927`	`}`
`928`	`928`
`929`		`-// initiateStreaming begins treaming of binary log events and registers listeners for such events`
	`929`	`+// initiateStreaming begins streaming of binary log events and registers listeners for such events`
`930`	`930`	`func (this *Migrator) initiateStreaming() error {`
`931`	`931`	`this.eventsStreamer = NewEventsStreamer(this.migrationContext)`
`932`	`932`	`if err := this.eventsStreamer.InitDBConnections(); err != nil {`