Browse Source

bus: dont start transaction when creating session

bergquist 7 years ago
parent
commit
9ca9a7c302
2 changed files with 5 additions and 1 deletions
  1. 0 1
      pkg/services/sqlstore/session.go
  2. 5 0
      pkg/services/sqlstore/transactions.go

+ 0 - 1
pkg/services/sqlstore/session.go

@@ -29,7 +29,6 @@ func startSession(ctx context.Context) *DBSession {
 
 	if !ok {
 		newSess := newSession()
-		newSess.Begin()
 		return newSess
 	}
 

+ 5 - 0
pkg/services/sqlstore/transactions.go

@@ -17,6 +17,10 @@ func (ss *SqlStore) inTransactionWithRetry(ctx context.Context, fn func(ctx cont
 	sess := startSession(ctx)
 	defer sess.Close()
 
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
 	withValue := context.WithValue(ctx, ContextSessionName, sess)
 
 	err := fn(withValue)
@@ -59,6 +63,7 @@ func inTransactionWithRetryCtx(ctx context.Context, callback dbTransactionFunc,
 	var err error
 
 	sess := startSession(ctx)
+
 	defer sess.Close()
 
 	if err = sess.Begin(); err != nil {