Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 09:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Un-manage FaultTolerantRedisCluster so it shuts down at JVM shutdown instead of Jetty shutdown.

Browse Source
This commit is contained in:
Jon Chambers
2020-07-30 18:20:37 -04:00
committed by Jon Chambers
parent 7cb24dd96d
commit 7bf8650d59
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@@ -382,7 +382,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
environment.lifecycle().manage(messagesCache);
environment.lifecycle().manage(accountDatabaseCrawler);
environment.lifecycle().manage(remoteConfigsManager);
environment.lifecycle().manage(cacheCluster);
environment.lifecycle().manage(clusterMessagePersister);
AWSCredentials credentials = new BasicAWSCredentials(config.getCdnConfiguration().getAccessKey(), config.getCdnConfiguration().getAccessSecret());

16
service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
View File

@@ -2,7 +2,6 @@ package org.whispersystems.textsecuregcm.redis;
import com.codahale.metrics.SharedMetricRegistries;
import com.google.common.annotations.VisibleForTesting;
import io.dropwizard.lifecycle.Managed;
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
import io.lettuce.core.RedisURI;
import io.lettuce.core.cluster.RedisClusterClient;
@@ -23,7 +22,7 @@ import java.util.stream.Collectors;
* read and write operations because the leader in a Redis cluster shard may fail while its read-only replicas can still
* serve traffic.
*/
public class FaultTolerantRedisCluster implements Managed {
public class FaultTolerantRedisCluster {
private final RedisClusterClient clusterClient;
@@ -56,6 +55,10 @@ public class FaultTolerantRedisCluster implements Managed {
FaultTolerantRedisCluster.class);
}
void shutdown() {
clusterClient.shutdown();
}
public void useReadCluster(final Consumer<StatefulRedisClusterConnection<String, String>> consumer) {
this.readCircuitBreaker.executeRunnable(() -> consumer.accept(stringClusterConnection));
}
@@ -87,13 +90,4 @@ public class FaultTolerantRedisCluster implements Managed {
public <T> T withBinaryWriteCluster(final Function<StatefulRedisClusterConnection<byte[], byte[]>, T> consumer) {
return this.writeCircuitBreaker.executeSupplier(() -> consumer.apply(binaryClusterConnection));
}
@Override
public void start() {
}
@Override
public void stop() {
clusterClient.shutdown();
}
}