Fixed - Spring Boot clientName setting isn't used #4827

pull/4843/head
Nikita Koksharov 2 years ago
parent 3739d399bf
commit 179c8765c6

@ -123,6 +123,7 @@ public class RedissonAutoConfiguration {
Method usernameMethod = ReflectionUtils.findMethod(RedisProperties.class, "getUsername"); Method usernameMethod = ReflectionUtils.findMethod(RedisProperties.class, "getUsername");
Method timeoutMethod = ReflectionUtils.findMethod(RedisProperties.class, "getTimeout"); Method timeoutMethod = ReflectionUtils.findMethod(RedisProperties.class, "getTimeout");
Method connectTimeoutMethod = ReflectionUtils.findMethod(RedisProperties.class, "getConnectTimeout"); Method connectTimeoutMethod = ReflectionUtils.findMethod(RedisProperties.class, "getConnectTimeout");
Method clientNameMethod = ReflectionUtils.findMethod(RedisProperties.class, "getClientName");
Object timeoutValue = ReflectionUtils.invokeMethod(timeoutMethod, redisProperties); Object timeoutValue = ReflectionUtils.invokeMethod(timeoutMethod, redisProperties);
Integer timeout = null; Integer timeout = null;
@ -142,6 +143,11 @@ public class RedissonAutoConfiguration {
connectTimeout = timeout; connectTimeout = timeout;
} }
String clientName = null;
if (clientNameMethod != null) {
clientName = (String) ReflectionUtils.invokeMethod(clientNameMethod, redisProperties);
}
String username = null; String username = null;
if (usernameMethod != null) { if (usernameMethod != null) {
username = (String) ReflectionUtils.invokeMethod(usernameMethod, redisProperties); username = (String) ReflectionUtils.invokeMethod(usernameMethod, redisProperties);
@ -189,7 +195,8 @@ public class RedissonAutoConfiguration {
.addSentinelAddress(nodes) .addSentinelAddress(nodes)
.setDatabase(redisProperties.getDatabase()) .setDatabase(redisProperties.getDatabase())
.setUsername(username) .setUsername(username)
.setPassword(redisProperties.getPassword()); .setPassword(redisProperties.getPassword())
.setClientName(clientName);
if (connectTimeout != null) { if (connectTimeout != null) {
c.setConnectTimeout(connectTimeout); c.setConnectTimeout(connectTimeout);
} }
@ -207,7 +214,8 @@ public class RedissonAutoConfiguration {
ClusterServersConfig c = config.useClusterServers() ClusterServersConfig c = config.useClusterServers()
.addNodeAddress(nodes) .addNodeAddress(nodes)
.setUsername(username) .setUsername(username)
.setPassword(redisProperties.getPassword()); .setPassword(redisProperties.getPassword())
.setClientName(clientName);
if (connectTimeout != null) { if (connectTimeout != null) {
c.setConnectTimeout(connectTimeout); c.setConnectTimeout(connectTimeout);
} }
@ -226,7 +234,8 @@ public class RedissonAutoConfiguration {
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort()) .setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
.setDatabase(redisProperties.getDatabase()) .setDatabase(redisProperties.getDatabase())
.setUsername(username) .setUsername(username)
.setPassword(redisProperties.getPassword()); .setPassword(redisProperties.getPassword())
.setClientName(clientName);
if (connectTimeout != null) { if (connectTimeout != null) {
c.setConnectTimeout(connectTimeout); c.setConnectTimeout(connectTimeout);
} }

Loading…
Cancel
Save