Skip to content

Allow using multiple memcached clients at the same time. #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GiedriusS merged 4 commits into from
May 24, 2020
Merged

Allow using multiple memcached clients at the same time. #2648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1644c2d
Allow using multiple memcached clients at the same time.
pstibrany May 22, 2020
aab7a7b
Added unit test to verify that we can have multiple clients.
pstibrany May 22, 2020
8bcd8ea
Added CHANGELOG.md entry.
pstibrany May 22, 2020
aac6c5b
Remove unused argument.
pstibrany May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove unused argument. 
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
  • Loading branch information
@pstibrany
pstibrany committed May 23, 2020
commit aac6c5b4667fcbadfc60de8aefee63c6bb3d6271
3 changes: 1 addition & 2 deletions pkg/cacheutil/memcached_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,11 @@ func NewMemcachedClientWithConfig(logger log.Logger, name string, config Memcach
if reg != nil {
reg = prometheus.WrapRegistererWith(prometheus.Labels{"name": name}, reg)
}
return newMemcachedClient(logger, name, client, selector, config, reg)
return newMemcachedClient(logger, client, selector, config, reg)
}

func newMemcachedClient(
logger log.Logger,
name string,
client memcachedClientBackend,
selector *MemcachedJumpHashSelector,
config MemcachedClientConfig,
Expand Down
2 changes: 1 addition & 1 deletion pkg/cacheutil/memcached_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func TestMemcachedClient_GetMulti(t *testing.T) {
func prepare(config MemcachedClientConfig, backendMock *memcachedClientBackendMock) (*memcachedClient, error) {
logger := log.NewNopLogger()
selector := &MemcachedJumpHashSelector{}
client, err := newMemcachedClient(logger, "test", backendMock, selector, config, nil)
client, err := newMemcachedClient(logger, backendMock, selector, config, nil)

return client, err
}
Expand Down