Correctly preserve error in group create rollbacks

heroiclabs · Mar 19, 2017 · 6f07b8a · 6f07b8a
1 parent a3f6988
commit 6f07b8a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/server/pipeline_group.go b/server/pipeline_group.go
@@ -110,9 +110,9 @@ func (p *pipeline) groupCreate(logger zap.Logger, session *session, envelope *En
 		if err != nil {
 			logger.Error("Could not create group", zap.Error(err))
 			if tx != nil {
-				err = tx.Rollback()
-				if err != nil {
-					logger.Error("Could not rollback transaction", zap.Error(err))
+				txErr := tx.Rollback()
+				if txErr != nil {
+					logger.Error("Could not rollback transaction", zap.Error(txErr))
 				}
 			}
 			if strings.HasSuffix(err.Error(), "violates unique constraint \"groups_name_key\"") {