Merge pull request #656 from scireum/feature/SIRI-921_upgrade_jedis

Upgrades Jedis library
scireum · May 28, 2024 · 9823a30 · 9823a30
2 parents 94fc66c + ed02ae6
commit 9823a30
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>4.2.3</version>
+            <version>5.1.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.json</groupId>

diff --git a/src/main/java/sirius/db/redis/RedisDB.java b/src/main/java/sirius/db/redis/RedisDB.java
@@ -8,6 +8,9 @@
 
 package sirius.db.redis;
 
+import redis.clients.jedis.ClientSetInfoConfig;
+import redis.clients.jedis.DefaultJedisClientConfig;
+import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
@@ -148,15 +151,24 @@ private synchronized Jedis setupConnection() {
             JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
             jedisPoolConfig.setMaxTotal(maxActive);
             jedisPoolConfig.setMaxIdle(maxIdle);
+
             Tuple<String, Integer> effectiveHostAndPort = PortMapper.mapPort(determineServiceName(), host, port);
-            jedis = new JedisPool(jedisPoolConfig,
-                                  effectiveHostAndPort.getFirst(),
-                                  effectiveHostAndPort.getSecond(),
-                                  connectTimeout,
-                                  readTimeout,
-                                  Strings.isFilled(password) ? password : null,
-                                  db,
-                                  CallContext.getNodeName());
+            HostAndPort hostAndPort =
+                    new HostAndPort(effectiveHostAndPort.getFirst(), effectiveHostAndPort.getSecond());
+
+            DefaultJedisClientConfig jedisClientConfig = DefaultJedisClientConfig.builder()
+                                                                                 .database(db)
+                                                                                 .clientName(CallContext.getNodeName())
+                                                                                 .connectionTimeoutMillis(connectTimeout)
+                                                                                 .socketTimeoutMillis(readTimeout)
+                                                                                 .clientSetInfoConfig(new ClientSetInfoConfig(
+                                                                                         true))
+                                                                                 .password(Strings.isFilled(password) ?
+                                                                                           password :
+                                                                                           null)
+                                                                                 .build();
+
+            jedis = new JedisPool(jedisPoolConfig, hostAndPort, jedisClientConfig);
         }
 
         return jedis.getResource();