Skip to content

Commit f151193

Browse files
use same id
1 parent b5ed302 commit f151193

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

otoroshi/app/next/plugins/rateLimiting.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,8 @@ class RateLimiter(_env: Env) {
11991199
private implicit val env: Env = _env
12001200
implicit val ec: ExecutionContext = _env.otoroshiExecutionContext
12011201

1202-
val strategies = new UnboundedTrieMap[String, ThrottlingStrategy]()
1202+
private val distributedRedisId = "otoroshi-rate-limiter-distributed-redis"
1203+
private val strategies = new UnboundedTrieMap[String, ThrottlingStrategy]()
12031204

12041205
lazy val distributedRedisSettings: RateLimiterDistributedRedisSettings = RateLimiterDistributedRedisSettings(
12051206
enabled = _env.configuration
@@ -1216,11 +1217,11 @@ class RateLimiter(_env: Env) {
12161217

12171218
def adhocRateLimiterRedis: otoroshi.storage.RedisLike = distributedRedisSettings.uris match {
12181219
case uris if uris.nonEmpty && uris.length == 1 =>_env.statefulClientsManager.client(
1219-
"otoroshi-rate-limiter-distributed-redis",
1220+
distributedRedisId,
12201221
otoroshi.statefulclients.DistributedRateLimiterLettuceStatefulClientConfig(uris.head)
12211222
)
12221223
case uris if uris.nonEmpty && uris.length > 1 =>_env.statefulClientsManager.client(
1223-
"otoroshi-rate-limiter-distributed-redis",
1224+
distributedRedisId,
12241225
otoroshi.statefulclients.DistributedRateLimiterLettuceClusterStatefulClientConfig(uris)
12251226
)
12261227
case _ => _env.datastores.redis
@@ -1229,11 +1230,11 @@ class RateLimiter(_env: Env) {
12291230
def globalRateLimiterRedis: otoroshi.storage.RedisLike = {
12301231
distributedRedisSettings.uris match {
12311232
case uris if uris.nonEmpty && uris.length == 1 && distributedRedisSettings.enabled => _env.statefulClientsManager.client(
1232-
"otoroshi-rate-limiter-distributed-redis",
1233+
distributedRedisId,
12331234
otoroshi.statefulclients.DistributedRateLimiterLettuceStatefulClientConfig(uris.head)
12341235
)
12351236
case uris if uris.nonEmpty && uris.length > 1 && distributedRedisSettings.enabled => _env.statefulClientsManager.client(
1236-
"otoroshi-rate-limiter-distributed-redis",
1237+
distributedRedisId,
12371238
otoroshi.statefulclients.DistributedRateLimiterLettuceClusterStatefulClientConfig(uris)
12381239
)
12391240
case _ => _env.datastores.redis

0 commit comments

Comments
 (0)