IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

bus: dont start transaction when creating session

Browse Source
This commit is contained in:
bergquist 2018-06-12 22:58:03 +02:00
parent 629eab0b1e
commit 9ca9a7c302
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/sqlstore/session.go
View File

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

5
pkg/services/sqlstore/transactions.go
View File

@ -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 {