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

User: Optimize signed in user cache management (#59090)

Browse Source 
* only access the cache if a user ID is set

* ignore all negative values
This commit is contained in:
Jo 2022-11-23 11:04:38 +00:00 committed by GitHub
parent c02f2321c1
commit d7a652ff7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/services/user/userimpl/user.go
View File

@ -232,11 +232,15 @@ func (s *Service) SetUsingOrg(ctx context.Context, cmd *user.SetUsingOrgCommand)
func (s *Service) GetSignedInUserWithCacheCtx(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) { func (s *Service) GetSignedInUserWithCacheCtx(ctx context.Context, query *user.GetSignedInUserQuery) (*user.SignedInUser, error) {
var signedInUser *user.SignedInUser var signedInUser *user.SignedInUser
cacheKey := newSignedInUserCacheKey(query.OrgID, query.UserID)
if cached, found := s.cacheService.Get(cacheKey); found { // only check cache if we have a user ID and an org ID in query
cachedUser := cached.(user.SignedInUser) if query.OrgID > 0 && query.UserID > 0 {
signedInUser = &cachedUser cacheKey := newSignedInUserCacheKey(query.OrgID, query.UserID)
return signedInUser, nil if cached, found := s.cacheService.Get(cacheKey); found {
cachedUser := cached.(user.SignedInUser)
signedInUser = &cachedUser
return signedInUser, nil
}
} }
result, err := s.GetSignedInUser(ctx, query) result, err := s.GetSignedInUser(ctx, query)
@ -244,7 +248,7 @@ func (s *Service) GetSignedInUserWithCacheCtx(ctx context.Context, query *user.G
return nil, err return nil, err
} }
cacheKey = newSignedInUserCacheKey(result.OrgID, query.UserID) cacheKey := newSignedInUserCacheKey(result.OrgID, result.UserID)
s.cacheService.Set(cacheKey, *result, time.Second*5) s.cacheService.Set(cacheKey, *result, time.Second*5)
return result, nil return result, nil
} }