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

moves migrations to /sqlstore/migrations

Browse Source
This commit is contained in:
bergquist 2018-12-13 09:52:13 +01:00
parent dbcc2e868d
commit 7aa84aeb61
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/infra/serverlock/serverlock.go
View File

@ -36,7 +36,7 @@ func (sl *ServerLockService) LockAndExecute(ctx context.Context, actionName stri
return err return err
} }
// avoid execution if last lock happened less than `matInterval` ago // avoid execution if last lock happened less than `maxInterval` ago
if rowLock.LastExecution != 0 { if rowLock.LastExecution != 0 {
lastExeuctionTime := time.Unix(rowLock.LastExecution, 0) lastExeuctionTime := time.Unix(rowLock.LastExecution, 0)
if lastExeuctionTime.Unix() > time.Now().Add(-maxInterval).Unix() { if lastExeuctionTime.Unix() > time.Now().Add(-maxInterval).Unix() {

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

@ -31,6 +31,7 @@ func AddMigrations(mg *Migrator) {
addTagMigration(mg) addTagMigration(mg)
addLoginAttemptMigrations(mg) addLoginAttemptMigrations(mg)
addUserAuthMigrations(mg) addUserAuthMigrations(mg)
addServerlockMigrations(mg)
} }
func addMigrationLogMigrations(mg *Migrator) { func addMigrationLogMigrations(mg *Migrator) {

5
pkg/infra/serverlock/migrations.go → pkg/services/sqlstore/migrations/serverlock_migrations.go
View File

@ -1,9 +1,8 @@
package serverlock package migrations
import "github.com/grafana/grafana/pkg/services/sqlstore/migrator" import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
// AddMigration create database migrations for server lock func addServerlockMigrations(mg *migrator.Migrator) {
func (sl *ServerLockService) AddMigration(mg *migrator.Migrator) {
serverLock := migrator.Table{ serverLock := migrator.Table{
Name: "server_lock", Name: "server_lock",
Columns: []*migrator.Column{ Columns: []*migrator.Column{