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

Fix so that correct cache is provided to di registry (#17566)

Browse Source 
This fix prevents Grafana from crashing after being logged in.

Ref #17519
This commit is contained in:
Marcus Efraimsson
2019-06-13 12:15:52 +02:00
committed by GitHub
parent 073851f9c7
commit e1df51109e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/grafana-server/server.go
View File

@@ -12,13 +12,13 @@ import (
"time" "time"
"github.com/facebookgo/inject" "github.com/facebookgo/inject"
"github.com/patrickmn/go-cache"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/grafana/grafana/pkg/api" "github.com/grafana/grafana/pkg/api"
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
_ "github.com/grafana/grafana/pkg/extensions" _ "github.com/grafana/grafana/pkg/extensions"
"github.com/grafana/grafana/pkg/infra/localcache"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
_ "github.com/grafana/grafana/pkg/infra/metrics" _ "github.com/grafana/grafana/pkg/infra/metrics"
_ "github.com/grafana/grafana/pkg/infra/remotecache" _ "github.com/grafana/grafana/pkg/infra/remotecache"
@@ -88,7 +88,7 @@ func (g *GrafanaServerImpl) Run() error {
if err != nil { if err != nil {
return fmt.Errorf("Failed to provide object to the graph: %v", err) return fmt.Errorf("Failed to provide object to the graph: %v", err)
} }
err = serviceGraph.Provide(&inject.Object{Value: cache.New(5*time.Minute, 10*time.Minute)}) err = serviceGraph.Provide(&inject.Object{Value: localcache.New(5*time.Minute, 10*time.Minute)})
if err != nil { if err != nil {
return fmt.Errorf("Failed to provide object to the graph: %v", err) return fmt.Errorf("Failed to provide object to the graph: %v", err)
} }