Merge pull request #797 from gobuffalo/prevent-conn-leak-but-do-not-swallow-panic

do not swallow panic when rolling back inner panic to prevent connection leak

Author: sio4

connection.go

@@ -168,9 +168,9 @@ func (c *Connection) Transaction(fn func(tx *Connection) error) error {
 				txlog(logging.SQL, cn, "ROLLBACK Transaction (inner function panic) ---")
 				dberr = cn.TX.Rollback()
 				if dberr != nil {
-					err = fmt.Errorf("database error while inner panic rollback: %w", dberr)
+					txlog(logging.Error, cn, "database error while inner panic rollback: %w", dberr)
 				}
-				err = fmt.Errorf("transaction was rolled back due to inner panic")
+				panic(ex)
 			}
 		}()
 

connection_test.go

@@ -138,10 +138,10 @@ func Test_Connection_Transaction(t *testing.T) {
 	})
 
 	t.Run("Panic", func(t *testing.T) {
-		err = c.Transaction(func(c *Connection) error {
-			panic("inner function panic")
+		r.PanicsWithValue("inner function panic", func() {
+			c.Transaction(func(c *Connection) error {
+				panic("inner function panic")
+			})
 		})
-		r.ErrorContains(err, "panic")
-		r.ErrorContains(err, "rolled back")
 	})
 }

logger.go

@@ -50,30 +50,35 @@ var txlog = func(lvl logging.Level, anon interface{}, s string, args ...interfac
 		} else {
 			s = fmt.Sprintf("%s - %s", lvl, s)
 		}
-
-		connID := ""
-		txID := 0
-		switch typed := anon.(type) {
-		case *Connection:
-			connID = typed.ID
-			if typed.TX != nil {
-				txID = typed.TX.ID
-			}
-		case *Tx:
-			txID = typed.ID
-		case store:
-			tx, err := typed.Transaction()
-			if err == nil {
-				txID = tx.ID
-			}
-		}
-		s = fmt.Sprintf("%s (conn=%v, tx=%v)", s, connID, txID)
 	} else {
 		s = fmt.Sprintf(s, args...)
 		s = fmt.Sprintf("%s - %s", lvl, s)
 	}
+
+	connID := ""
+	txID := 0
+	switch typed := anon.(type) {
+	case *Connection:
+		connID = typed.ID
+		if typed.TX != nil {
+			txID = typed.TX.ID
+		}
+	case *Tx:
+		txID = typed.ID
+	case store:
+		tx, err := typed.Transaction()
+		if err == nil {
+			txID = tx.ID
+		}
+	}
+
+	if connID != "" || txID != 0 {
+		s = fmt.Sprintf("%s (conn=%v, tx=%v)", s, connID, txID)
+	}
+
 	if Color {
 		s = color.YellowString(s)
 	}
+
 	defaultStdLogger.Println(s)
 }