Skip to content

Commit c9b7ec1

Browse files
author
yaozhichao
committed
refactor(redisConfig): 1.redis配置代码重构
1 parent 953f23b commit c9b7ec1

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

mqtt-broker/src/main/java/joey/mqtt/broker/redis/RedisFactory.java

+20-16
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import redis.clients.jedis.JedisPool;
66
import redis.clients.jedis.JedisPoolConfig;
77

8+
import java.time.Duration;
9+
810
/**
911
* redis工厂
1012
* @author Joey
@@ -23,29 +25,31 @@ private RedisFactory() {
2325
*/
2426
public static RedisClient createRedisClient(RedisConfig redisConfig) {
2527
JedisPoolConfig config = new JedisPoolConfig();
26-
//最大空闲连接数, 默认8个
27-
config.setMaxIdle(redisConfig.getPool().getMaxIdle());
2828

29-
//最大连接数, 默认8个
30-
config.setMaxTotal(redisConfig.getPool().getMaxActive());
29+
// 最大空闲连接数, 默认8个
30+
RedisConfig.Pool pool = redisConfig.getPool();
31+
config.setMaxIdle(pool.getMaxIdle());
32+
33+
// 最大连接数, 默认8个
34+
config.setMaxTotal(pool.getMaxActive());
3135

32-
//获取连接时的最大等待毫秒数(如果设置为阻塞时BlockWhenExhausted),如果超时就抛异常, 小于零:阻塞不确定的时间, 默认-1
33-
config.setMaxWaitMillis(redisConfig.getPool().getMaxWait());
36+
// 获取连接时的最大等待毫秒数(如果设置为阻塞时BlockWhenExhausted),如果超时就抛异常, 小于零:阻塞不确定的时间, 默认-1
37+
config.setMaxWait(Duration.ofMillis(pool.getMaxWait()));
3438

35-
//逐出连接的最小空闲时间 默认1800000毫秒(30分钟)
36-
config.setMinEvictableIdleTimeMillis(redisConfig.getPool().getMinEvictableIdleTimeMillis());
39+
// 逐出连接的最小空闲时间 默认1800000毫秒(30分钟)
40+
config.setMinEvictableIdleTime(Duration.ofMillis(pool.getMinEvictableIdleTimeMillis()));
3741

38-
//最小空闲连接数, 默认0
39-
config.setMinIdle(redisConfig.getPool().getMinIdle());
42+
// 最小空闲连接数, 默认0
43+
config.setMinIdle(pool.getMinIdle());
4044

41-
//在获取连接的时候检查有效性, 默认false
42-
config.setTestOnBorrow(redisConfig.getPool().isTestOnBorrow());
45+
// 在获取连接的时候检查有效性, 默认false
46+
config.setTestOnBorrow(pool.isTestOnBorrow());
4347

44-
//在空闲时检查有效性, 默认false
45-
config.setTestWhileIdle(redisConfig.getPool().isTestWhileIdle());
48+
// 在空闲时检查有效性, 默认false
49+
config.setTestWhileIdle(pool.isTestWhileIdle());
4650

47-
//逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
48-
config.setTimeBetweenEvictionRunsMillis(redisConfig.getPool().getTimeBetweenEvictionRunsMillis());
51+
// 逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
52+
config.setTimeBetweenEvictionRuns(Duration.ofMillis(pool.getTimeBetweenEvictionRunsMillis()));
4953

5054
String password = StrUtil.trimToNull(redisConfig.getPassword());
5155
JedisPool jedisPool = new JedisPool(config, redisConfig.getHost(),

0 commit comments

Comments
 (0)