chore(groupcache): Groupcache doesn't need global server handler anymore (#6820)

Remove it from the constructor

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
pull/6824/head
Kaviraj Kanagaraj 3 years ago committed by GitHub
parent 7b70d3d939
commit 9f06bc0083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pkg/loki/modules.go
  2. 3
      pkg/storage/chunk/cache/groupcache.go
  3. 4
      pkg/storage/chunk/cache/groupcache_test.go

@ -161,7 +161,7 @@ func (t *Loki) initGroupcache() (_ services.Service, err error) {
t.groupcacheRingManager = rm t.groupcacheRingManager = rm
t.Server.HTTP.Path("/groupcache/ring").Methods("GET", "POST").Handler(t.groupcacheRingManager) t.Server.HTTP.Path("/groupcache/ring").Methods("GET", "POST").Handler(t.groupcacheRingManager)
gc, err := cache.NewGroupCache(rm, t.Cfg.Common.GroupCacheConfig, t.Server, util_log.Logger, prometheus.DefaultRegisterer) gc, err := cache.NewGroupCache(rm, t.Cfg.Common.GroupCacheConfig, util_log.Logger, prometheus.DefaultRegisterer)
if err != nil { if err != nil {
return nil, err return nil, err
} }

@ -21,7 +21,6 @@ import (
"github.com/mailgun/groupcache/v2" "github.com/mailgun/groupcache/v2"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/weaveworks/common/server"
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/go-kit/log/level" "github.com/go-kit/log/level"
@ -89,7 +88,7 @@ type ringManager interface {
Ring() ring.ReadRing Ring() ring.ReadRing
} }
func NewGroupCache(rm ringManager, config GroupCacheConfig, server *server.Server, logger log.Logger, reg prometheus.Registerer) (*GroupCache, error) { func NewGroupCache(rm ringManager, config GroupCacheConfig, logger log.Logger, reg prometheus.Registerer) (*GroupCache, error) {
addr := fmt.Sprintf("http://%s", rm.Addr()) addr := fmt.Sprintf("http://%s", rm.Addr())
level.Info(logger).Log("msg", "groupcache local address set to", "addr", addr) level.Info(logger).Log("msg", "groupcache local address set to", "addr", addr)

@ -5,8 +5,6 @@ import (
"testing" "testing"
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/gorilla/mux"
"github.com/weaveworks/common/server"
"github.com/grafana/dskit/ring" "github.com/grafana/dskit/ring"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -64,7 +62,7 @@ func setupGroupCache() (*GroupCache, error) {
return NewGroupCache(&mockRingManager{}, GroupCacheConfig{ return NewGroupCache(&mockRingManager{}, GroupCacheConfig{
Enabled: true, Enabled: true,
CapacityMB: 1, CapacityMB: 1,
}, &server.Server{HTTP: mux.NewRouter()}, log.NewNopLogger(), nil) }, log.NewNopLogger(), nil)
} }
type mockRingManager struct{} type mockRingManager struct{}

Loading…
Cancel
Save