Merge pull request #96 from hellofresh/hotfix/small-improvements

Fix typo and improve error handling
hellofresh · Mar 16, 2018 · ac1b47e · ac1b47e
2 parents 090eb93 + 8e70a96
commit ac1b47e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/pkg/dumper/dumper.go b/pkg/dumper/dumper.go
@@ -18,7 +18,7 @@ type (
 		NewConnection(ConnOpts, reader.Reader) (Dumper, error)
 	}
 
-	// A Dumper writes a database's stucture to the provided stream.
+	// A Dumper writes a database's structure to the provided stream.
 	Dumper interface {
 		// Dump executes the dump process.
 		Dump(chan<- struct{}, *config.Spec, int) error

diff --git a/pkg/dumper/mysql/dumper.go b/pkg/dumper/mysql/dumper.go
@@ -54,10 +54,12 @@ func (d *myDumper) DumpTable(tableName string, rowChan <-chan database.Row) erro
 
 	insertedRows, err := d.insertIntoTable(txn, tableName, rowChan)
 	if err != nil {
+		defer func() {
+			if err := txn.Rollback(); err != nil {
+				log.WithError(err).Error("failed to rollback")
+			}
+		}()
 		err = errors.Wrap(err, "failed to insert rows")
-		if err := txn.Rollback(); err != nil {
-			return errors.Wrap(err, "failed to rollback transaction")
-		}
 		return err
 	}
 

diff --git a/pkg/dumper/postgres/dumper.go b/pkg/dumper/postgres/dumper.go
@@ -48,11 +48,15 @@ func (d *pgDumper) DumpTable(tableName string, rowChan <-chan database.Row) erro
 
 	insertedRows, err := d.insertIntoTable(txn, tableName, rowChan)
 	if err != nil {
+		defer func() {
+			if err := txn.Rollback(); err != nil {
+				log.WithError(err).Error("failed to rollback")
+			}
+		}()
 		err = errors.Wrap(err, "failed to insert rows")
-		if err := txn.Rollback(); err != nil {
-			return errors.Wrap(err, "failed to rollback transaction")
-		}
+		return err
 	}
+
 	log.WithFields(log.Fields{
 		"table":    tableName,
 		"inserted": insertedRows,