Skip to content

N
nexpie-grafana-theme
Commit e1df5110 by Marcus Efraimsson Committed by GitHub
Options

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

This fix prevents Grafana from crashing after being logged in.

Ref #17519
parent 073851f9
Showing with 2 additions and 2 deletions
pkg/cmd/grafana-server/server.go
...@@ -12,13 +12,13 @@ import ( ...@@ -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 { ...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment