From e6da54d9b805b48910d472cc4eb2b156334d1dc0 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Tue, 20 Oct 2020 19:04:44 -0400 Subject: [PATCH] Resolve build error introduced while merging. --- .../workers/GetRedisCommandStatsCommand.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/GetRedisCommandStatsCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/GetRedisCommandStatsCommand.java index c4d913d42..96862b99c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/GetRedisCommandStatsCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/GetRedisCommandStatsCommand.java @@ -2,6 +2,7 @@ package org.whispersystems.textsecuregcm.workers; import io.dropwizard.cli.ConfiguredCommand; import io.dropwizard.setup.Bootstrap; +import io.lettuce.core.resource.ClientResources; import net.sourceforge.argparse4j.inf.Namespace; import org.whispersystems.textsecuregcm.WhisperServerConfiguration; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; @@ -15,10 +16,12 @@ public class GetRedisCommandStatsCommand extends ConfiguredCommand bootstrap, final Namespace namespace, final WhisperServerConfiguration config) throws Exception { - final FaultTolerantRedisCluster cacheCluster = new FaultTolerantRedisCluster("main_cache_cluster", config.getCacheClusterConfiguration()); - final FaultTolerantRedisCluster messagesCacheCluster = new FaultTolerantRedisCluster("messages_cluster", config.getMessageCacheConfiguration().getRedisClusterConfiguration()); - final FaultTolerantRedisCluster metricsCluster = new FaultTolerantRedisCluster("metrics_cluster", config.getMetricsClusterConfiguration()); + protected void run(final Bootstrap bootstrap, final Namespace namespace, final WhisperServerConfiguration config) { + final ClientResources redisClusterClientResources = ClientResources.builder().build(); + + final FaultTolerantRedisCluster cacheCluster = new FaultTolerantRedisCluster("main_cache_cluster", config.getCacheClusterConfiguration(), redisClusterClientResources); + final FaultTolerantRedisCluster messagesCacheCluster = new FaultTolerantRedisCluster("messages_cluster", config.getMessageCacheConfiguration().getRedisClusterConfiguration(), redisClusterClientResources); + final FaultTolerantRedisCluster metricsCluster = new FaultTolerantRedisCluster("metrics_cluster", config.getMetricsClusterConfiguration(), redisClusterClientResources); for (final FaultTolerantRedisCluster cluster : List.of(cacheCluster, messagesCacheCluster, metricsCluster)) { cluster.useCluster(connection -> connection.sync()