opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 16:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: capitalise log message for auth packages (#74332)

Browse Source
This commit is contained in:
Serge Zaitsev
2023-09-04 18:49:47 +02:00
committed by GitHub
parent 58f6648505
commit 8187d8cb66
32 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/services/accesscontrol/migrator/migrator.go
View File

@ -25,12 +25,12 @@ func MigrateScopeSplit(db db.DB, log log.Logger) error {
if errFind := db.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
return sess.SQL("SELECT * FROM permission WHERE NOT scope = '' AND identifier = ''").Find(&permissions)
}); errFind != nil {
log.Error("could not search for permissions to update", "migration", "scopeSplit", "error", errFind)
log.Error("Could not search for permissions to update", "migration", "scopeSplit", "error", errFind)
return errFind
}
if len(permissions) == 0 {
log.Debug("no permission require a scope split", "migration", "scopeSplit")
log.Debug("No permission require a scope split", "migration", "scopeSplit")
return nil
}
@ -68,16 +68,16 @@ func MigrateScopeSplit(db db.DB, log log.Logger) error {
// Batch update the permissions
if errBatchUpdate := db.GetSqlxSession().WithTransaction(ctx, func(tx *session.SessionTx) error {
if _, errDel := tx.Exec(ctx, delQuery, delArgs...); errDel != nil {
log.Error("error deleting permissions", "migration", "scopeSplit", "error", errDel)
log.Error("Error deleting permissions", "migration", "scopeSplit", "error", errDel)
return errDel
}
if _, errInsert := tx.Exec(ctx, insertQuery, insertArgs...); errInsert != nil {
log.Error("error saving permissions", "migration", "scopeSplit", "error", errInsert)
log.Error("Error saving permissions", "migration", "scopeSplit", "error", errInsert)
return errInsert
}
return nil
}); errBatchUpdate != nil {
log.Error("error updating permission batch", "migration", "scopeSplit", "start", start, "end", end)
log.Error("Error updating permission batch", "migration", "scopeSplit", "start", start, "end", end)
return errBatchUpdate
}
@ -85,11 +85,11 @@ func MigrateScopeSplit(db db.DB, log log.Logger) error {
return nil
})
if errBatchUpdate != nil {
log.Error("could not migrate permissions", "migration", "scopeSplit", "total", len(permissions), "succeeded", cnt, "left", len(permissions)-cnt, "error", errBatchUpdate)
log.Error("Could not migrate permissions", "migration", "scopeSplit", "total", len(permissions), "succeeded", cnt, "left", len(permissions)-cnt, "error", errBatchUpdate)
return errBatchUpdate
}
log.Debug("migrated permissions", "migration", "scopeSplit", "total", len(permissions), "succeeded", cnt, "in", time.Since(t))
log.Debug("Migrated permissions", "migration", "scopeSplit", "total", len(permissions), "succeeded", cnt, "in", time.Since(t))
return nil
}