IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-01 11:47:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: tighten revive exit code & make it happy (#17127)

Browse Source 
* Revive should fail the build

* Fix the associated errors
This commit is contained in:
Oleg Gaidarenko 2019-05-17 08:35:37 +03:00 committed by GitHub
parent 0a9863a8b4
commit 756da8a134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ import (
// WithTransactionalDbSession calls the callback with an session within a transaction
func (ss *SqlStore) WithTransactionalDbSession(ctx context.Context, callback dbTransactionFunc) error {
return inTransactionWithRetryCtx(ss.engine, ctx, callback, 0)
return inTransactionWithRetryCtx(ctx, ss.engine, callback, 0)
}
func (ss *SqlStore) InTransaction(ctx context.Context, fn func(ctx context.Context) error) error {
@ -20,17 +20,17 @@ func (ss *SqlStore) InTransaction(ctx context.Context, fn func(ctx context.Conte
}
func (ss *SqlStore) inTransactionWithRetry(ctx context.Context, fn func(ctx context.Context) error, retry int) error {
return inTransactionWithRetryCtx(ss.engine, ctx, func(sess *DBSession) error {
return inTransactionWithRetryCtx(ctx, ss.engine, func(sess *DBSession) error {
withValue := context.WithValue(ctx, ContextSessionName, sess)
return fn(withValue)
}, retry)
}
func inTransactionWithRetry(callback dbTransactionFunc, retry int) error {
return inTransactionWithRetryCtx(x, context.Background(), callback, retry)
return inTransactionWithRetryCtx(context.Background(), x, callback, retry)
}
func inTransactionWithRetryCtx(engine *xorm.Engine, ctx context.Context, callback dbTransactionFunc, retry int) error {
func inTransactionWithRetryCtx(ctx context.Context, engine *xorm.Engine, callback dbTransactionFunc, retry int) error {
sess, err := startSession(ctx, engine, true)
if err != nil {
return err
@ -73,5 +73,5 @@ func inTransaction(callback dbTransactionFunc) error {
}
func inTransactionCtx(ctx context.Context, callback dbTransactionFunc) error {
return inTransactionWithRetryCtx(x, ctx, callback, 0)
return inTransactionWithRetryCtx(ctx, x, callback, 0)
}

2
scripts/go/configs/revive.toml
View File

@ -1,7 +1,7 @@
ignoreGeneratedHeader = false
severity = "error"
confidence = 0.8
errorCode = 0
errorCode = 1
[rule.context-as-argument]
[rule.error-return]