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

Remove unnecessary "-breaker" and "-retry" suffixes from names

Browse Source
This commit is contained in:
Jon Chambers
2025-08-27 14:27:26 -04:00
committed by Jon Chambers
parent bc20aee7c9
commit 53f9c7b31f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/main/java/org/whispersystems/textsecuregcm/http/FaultTolerantHttpClient.java
View File

@@ -219,16 +219,14 @@ public class FaultTolerantHttpClient {
retryConfigBuilder.retryOnException(retryOnException);
}
retry = ResilienceUtil.getRetryRegistry().retry(name + "-retry", retryConfigBuilder.build());
retry = ResilienceUtil.getRetryRegistry().retry(name, retryConfigBuilder.build());
} else {
retry = null;
}
final String circuitBreakerName = name + "-breaker";
final CircuitBreaker circuitBreaker = circuitBreakerConfigurationName != null
? ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(circuitBreakerName, circuitBreakerConfigurationName)
: ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(circuitBreakerName);
? ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name, circuitBreakerConfigurationName)
: ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name);
return new FaultTolerantHttpClient(httpClients, requestTimeout, retryExecutor, retry, circuitBreaker);
}

4
service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisClient.java
View File

@@ -40,8 +40,8 @@ public class FaultTolerantRedisClient {
RedisUriUtil.createRedisUriWithTimeout(redisConfiguration.getUri(), redisConfiguration.getTimeout()),
redisConfiguration.getTimeout(),
redisConfiguration.getCircuitBreakerConfigurationName() != null
? ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name + "-breaker", redisConfiguration.getCircuitBreakerConfigurationName())
: ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name + "-breaker"));
? ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name, redisConfiguration.getCircuitBreakerConfigurationName())
: ResilienceUtil.getCircuitBreakerRegistry().circuitBreaker(name));
}
@VisibleForTesting