From 7aa84aeb61c2838aad358364b8387209f9424019 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 13 Dec 2018 09:52:13 +0100
Subject: [PATCH] moves migrations to /sqlstore/migrations

---
 pkg/infra/serverlock/serverlock.go                           | 2 +-
 pkg/services/sqlstore/migrations/migrations.go               | 1 +
 .../sqlstore/migrations/serverlock_migrations.go}            | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename pkg/{infra/serverlock/migrations.go => services/sqlstore/migrations/serverlock_migrations.go} (83%)

diff --git a/pkg/infra/serverlock/serverlock.go b/pkg/infra/serverlock/serverlock.go
index 84dcaf25e93..824fa0484b2 100644
--- a/pkg/infra/serverlock/serverlock.go
+++ b/pkg/infra/serverlock/serverlock.go
@@ -36,7 +36,7 @@ func (sl *ServerLockService) LockAndExecute(ctx context.Context, actionName stri
 		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 {
 		lastExeuctionTime := time.Unix(rowLock.LastExecution, 0)
 		if lastExeuctionTime.Unix() > time.Now().Add(-maxInterval).Unix() {
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 58ac6256f41..36cd8e5ed62 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -31,6 +31,7 @@ func AddMigrations(mg *Migrator) {
 	addTagMigration(mg)
 	addLoginAttemptMigrations(mg)
 	addUserAuthMigrations(mg)
+	addServerlockMigrations(mg)
 }
 
 func addMigrationLogMigrations(mg *Migrator) {
diff --git a/pkg/infra/serverlock/migrations.go b/pkg/services/sqlstore/migrations/serverlock_migrations.go
similarity index 83%
rename from pkg/infra/serverlock/migrations.go
rename to pkg/services/sqlstore/migrations/serverlock_migrations.go
index 6498b3de550..bc817a90665 100644
--- a/pkg/infra/serverlock/migrations.go
+++ b/pkg/services/sqlstore/migrations/serverlock_migrations.go
@@ -1,9 +1,8 @@
-package serverlock
+package migrations
 
 import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 
-// AddMigration create database migrations for server lock
-func (sl *ServerLockService) AddMigration(mg *migrator.Migrator) {
+func addServerlockMigrations(mg *migrator.Migrator) {
 	serverLock := migrator.Table{
 		Name: "server_lock",
 		Columns: []*migrator.Column{