opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-28 13:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove bus from search service (#44825)

Browse Source
This commit is contained in:
ying-jeanne
2022-02-04 01:46:38 +08:00
committed by GitHub
parent 3ce0730558
commit c5211f848d
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@ -373,7 +373,7 @@ func (hs *HTTPServer) registerRoutes() {
// Search // Search
apiRoute.Get("/search/sorting", routing.Wrap(hs.ListSortOptions)) apiRoute.Get("/search/sorting", routing.Wrap(hs.ListSortOptions))
apiRoute.Get("/search/", routing.Wrap(Search)) apiRoute.Get("/search/", routing.Wrap(hs.Search))
// metrics // metrics
apiRoute.Post("/tsdb/query", authorize(reqSignedIn, ac.EvalPermission(ActionDatasourcesQuery)), routing.Wrap(hs.QueryMetrics)) apiRoute.Post("/tsdb/query", authorize(reqSignedIn, ac.EvalPermission(ActionDatasourcesQuery)), routing.Wrap(hs.QueryMetrics))

5
pkg/api/search.go
View File

@ -7,13 +7,12 @@ import (
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/search"
) )
func Search(c *models.ReqContext) response.Response { func (hs *HTTPServer) Search(c *models.ReqContext) response.Response {
query := c.Query("query") query := c.Query("query")
tags := c.QueryStrings("tag") tags := c.QueryStrings("tag")
starred := c.Query("starred") starred := c.Query("starred")
@ -62,7 +61,7 @@ func Search(c *models.ReqContext) response.Response {
Sort: sort, Sort: sort,
} }
err := bus.Dispatch(c.Req.Context(), &searchQuery) err := hs.SearchService.SearchHandler(c.Req.Context(), &searchQuery)
if err != nil { if err != nil {
return response.Error(500, "Search failed", err) return response.Error(500, "Search failed", err)
} }

5
pkg/services/search/service.go
View File

@ -60,9 +60,8 @@ type FindPersistedDashboardsQuery struct {
} }
type SearchService struct { type SearchService struct {
Bus bus.Bus Bus bus.Bus
Cfg *setting.Cfg Cfg *setting.Cfg
sortOptions map[string]SortOption sortOptions map[string]SortOption
} }