MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove now-unused presence cluster configuration

This commit is contained in:
Jon Chambers 2024-11-06 15:59:13 -05:00 committed by Jon Chambers
parent 1c167ec150
commit 5aaf4cad20
5 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/config/sample.yml
View File

@ -160,9 +160,6 @@ dynamoDbTables:
cacheCluster: # Redis server configuration for cache cluster cacheCluster: # Redis server configuration for cache cluster
configurationUri: redis://redis.example.com:6379/ configurationUri: redis://redis.example.com:6379/
clientPresenceCluster: # Redis server configuration for client presence cluster
configurationUri: redis://redis.example.com:6379/
pubsub: # Redis server configuration for pubsub cluster pubsub: # Redis server configuration for pubsub cluster
uri: redis://redis.example.com:6379/ uri: redis://redis.example.com:6379/

9
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
View File

@ -165,11 +165,6 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty @JsonProperty
private MessageCacheConfiguration messageCache; private MessageCacheConfiguration messageCache;
@NotNull
@Valid
@JsonProperty
private FaultTolerantRedisClusterFactory clientPresenceCluster;
@Valid @Valid
@NotNull @NotNull
@JsonProperty @JsonProperty
@ -411,10 +406,6 @@ public class WhisperServerConfiguration extends Configuration {
return messageCache; return messageCache;
} }
public FaultTolerantRedisClusterFactory getClientPresenceClusterConfiguration() {
return clientPresenceCluster;
}
public FaultTolerantRedisClusterFactory getPushSchedulerCluster() { public FaultTolerantRedisClusterFactory getPushSchedulerCluster() {
return pushSchedulerCluster; return pushSchedulerCluster;
} }

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

@ -451,8 +451,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
FaultTolerantRedisClusterClient messagesCluster = FaultTolerantRedisClusterClient messagesCluster =
config.getMessageCacheConfiguration().getRedisClusterConfiguration() config.getMessageCacheConfiguration().getRedisClusterConfiguration()
.build("messages", sharedClientResources.mutate()); .build("messages", sharedClientResources.mutate());
FaultTolerantRedisClusterClient clientPresenceCluster = config.getClientPresenceClusterConfiguration()
.build("client_presence", sharedClientResources.mutate());
FaultTolerantRedisClusterClient pushSchedulerCluster = config.getPushSchedulerCluster().build("push_scheduler", FaultTolerantRedisClusterClient pushSchedulerCluster = config.getPushSchedulerCluster().build("push_scheduler",
sharedClientResources.mutate()); sharedClientResources.mutate());
FaultTolerantRedisClusterClient rateLimitersCluster = config.getRateLimitersCluster().build("rate_limiters", FaultTolerantRedisClusterClient rateLimitersCluster = config.getRateLimitersCluster().build("rate_limiters",

2
service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
View File

@ -199,8 +199,6 @@ record CommandDependencies(
messageDeletionExecutor); messageDeletionExecutor);
FaultTolerantRedisClusterClient messagesCluster = configuration.getMessageCacheConfiguration() FaultTolerantRedisClusterClient messagesCluster = configuration.getMessageCacheConfiguration()
.getRedisClusterConfiguration().build("messages", redisClientResourcesBuilder); .getRedisClusterConfiguration().build("messages", redisClientResourcesBuilder);
FaultTolerantRedisClusterClient clientPresenceCluster = configuration.getClientPresenceClusterConfiguration()
.build("client_presence", redisClientResourcesBuilder);
FaultTolerantRedisClusterClient rateLimitersCluster = configuration.getRateLimitersCluster().build("rate_limiters", FaultTolerantRedisClusterClient rateLimitersCluster = configuration.getRateLimitersCluster().build("rate_limiters",
redisClientResourcesBuilder); redisClientResourcesBuilder);
SecureValueRecovery2Client secureValueRecovery2Client = new SecureValueRecovery2Client( SecureValueRecovery2Client secureValueRecovery2Client = new SecureValueRecovery2Client(

3
service/src/test/resources/config/test.yml
View File

@ -156,9 +156,6 @@ dynamoDbTables:
cacheCluster: # Redis server configuration for cache cluster cacheCluster: # Redis server configuration for cache cluster
type: local type: local
clientPresenceCluster: # Redis server configuration for client presence cluster
type: local
pubsub: # Redis server configuration for pubsub cluster pubsub: # Redis server configuration for pubsub cluster
type: local type: local