From cce46a6349a2becad714d43d98e2b4abf2e6dc59 Mon Sep 17 00:00:00 2001 From: Serge Zaitsev Date: Mon, 21 Mar 2022 20:34:19 +0100 Subject: [PATCH] Chore: Remove bus from live package (#46803) --- pkg/services/live/features/dashboard.go | 7 ++++--- pkg/services/live/live.go | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/services/live/features/dashboard.go b/pkg/services/live/features/dashboard.go index 9d3ea6a59ee..7a2d76b384d 100644 --- a/pkg/services/live/features/dashboard.go +++ b/pkg/services/live/features/dashboard.go @@ -8,9 +8,9 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" - "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/guardian" + "github.com/grafana/grafana/pkg/services/sqlstore" ) type actionType string @@ -39,6 +39,7 @@ type dashboardEvent struct { type DashboardHandler struct { Publisher models.ChannelPublisher ClientCount models.ChannelClientCount + Store sqlstore.Store } // GetHandlerForPath called on init @@ -62,7 +63,7 @@ func (h *DashboardHandler) OnSubscribe(ctx context.Context, user *models.SignedI // make sure can view this dashboard if len(parts) == 2 && parts[0] == "uid" { query := models.GetDashboardQuery{Uid: parts[1], OrgId: user.OrgId} - if err := bus.Dispatch(ctx, &query); err != nil { + if err := h.Store.GetDashboard(ctx, &query); err != nil { logger.Error("Error getting dashboard", "query", query, "error", err) return models.SubscribeReply{}, backend.SubscribeStreamStatusNotFound, nil } @@ -109,7 +110,7 @@ func (h *DashboardHandler) OnPublish(ctx context.Context, user *models.SignedInU return models.PublishReply{}, backend.PublishStreamStatusNotFound, fmt.Errorf("ignore???") } query := models.GetDashboardQuery{Uid: parts[1], OrgId: user.OrgId} - if err := bus.Dispatch(ctx, &query); err != nil { + if err := h.Store.GetDashboard(ctx, &query); err != nil { logger.Error("Unknown dashboard", "query", query) return models.PublishReply{}, backend.PublishStreamStatusNotFound, nil } diff --git a/pkg/services/live/live.go b/pkg/services/live/live.go index 270def38838..d03b6453076 100644 --- a/pkg/services/live/live.go +++ b/pkg/services/live/live.go @@ -236,6 +236,7 @@ func ProvideService(plugCtxProvider *plugincontext.Provider, cfg *setting.Cfg, r dash := &features.DashboardHandler{ Publisher: g.Publish, ClientCount: g.ClientCount, + Store: sqlStore, } g.storage = database.NewStorage(g.SQLStore, g.CacheService) g.GrafanaScope.Dashboards = dash