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

fix failing tests

Browse Source
This commit is contained in:
Marcus Efraimsson 2018-11-02 16:03:12 +01:00
parent 940f510856
commit 6ef941ea17
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,7 @@ func InitTestDB(t *testing.T) *SqlStore {
sqlstore := &SqlStore{} sqlstore := &SqlStore{}
sqlstore.skipEnsureAdmin = true sqlstore.skipEnsureAdmin = true
sqlstore.Bus = bus.New() sqlstore.Bus = bus.New()
sqlstore.CacheService = cache.New(5*time.Minute, 10*time.Minute)
dbType := migrator.SQLITE dbType := migrator.SQLITE

23
pkg/services/sqlstore/user.go
View File

@ -16,7 +16,7 @@ import (
) )
func (ss *SqlStore) addUserQueryAndCommandHandlers() { func (ss *SqlStore) addUserQueryAndCommandHandlers() {
ss.Bus.AddHandler(ss.GetSignedInUser) ss.Bus.AddHandler(ss.GetSignedInUserWithCache)
bus.AddHandler("sql", GetUserById) bus.AddHandler("sql", GetUserById)
bus.AddHandler("sql", UpdateUser) bus.AddHandler("sql", UpdateUser)
@ -345,18 +345,24 @@ func GetUserOrgList(query *m.GetUserOrgListQuery) error {
return err return err
} }
func (ss *SqlStore) GetSignedInUser(query *m.GetSignedInUserQuery) error { func (ss *SqlStore) GetSignedInUserWithCache(query *m.GetSignedInUserQuery) error {
orgId := "u.org_id" cacheKey := fmt.Sprintf("signed-in-user-%d-%d", query.UserId, query.OrgId)
if query.OrgId > 0 {
orgId = strconv.FormatInt(query.OrgId, 10)
}
cacheKey := fmt.Sprintf("signed-in-user-%d-%s", query.UserId, query.OrgId)
if cached, found := ss.CacheService.Get(cacheKey); found { if cached, found := ss.CacheService.Get(cacheKey); found {
query.Result = cached.(*m.SignedInUser) query.Result = cached.(*m.SignedInUser)
return nil return nil
} }
err := GetSignedInUser(query)
ss.CacheService.Set(cacheKey, query.Result, time.Second*5)
return err
}
func GetSignedInUser(query *m.GetSignedInUserQuery) error {
orgId := "u.org_id"
if query.OrgId > 0 {
orgId = strconv.FormatInt(query.OrgId, 10)
}
var rawSql = `SELECT var rawSql = `SELECT
u.id as user_id, u.id as user_id,
u.is_admin as is_grafana_admin, u.is_admin as is_grafana_admin,
@ -407,7 +413,6 @@ func (ss *SqlStore) GetSignedInUser(query *m.GetSignedInUserQuery) error {
} }
query.Result = &user query.Result = &user
ss.CacheService.Set(cacheKey, &user, time.Second*5)
return err return err
} }