[#9666] Fixed redis properties

pinpoint-apm · May 22, 2023 · b1572be · b1572be
1 parent 9e0ef71
commit b1572be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/...corp/pinpoint/web/realtime/activethread/count/websocket/ActiveThreadCountHandlerImpl.java b/...corp/pinpoint/web/realtime/activethread/count/websocket/ActiveThreadCountHandlerImpl.java
@@ -117,8 +117,8 @@ private Consumer<Long> makeTickHandler(SessionContext ctx, WebSocketSession sess
         final List<ClusterKey> agentKeys =
                 this.agentLookupService.getRecentAgents(applicationName, TimeUnit.HOURS.toMillis(1));
         final TickHandler handler = new TickHandler(session, applicationName, agentKeys, getFetchers(agentKeys));
-
-        return ignoreArgument(decorateHandler(ctx.getTaskDecorator(), handler));
+        final Runnable decoratedHandler = decorateHandler(ctx.getTaskDecorator(), handler);
+        return t -> decoratedHandler.run();
     }
 
     private List<Fetcher<ATCSupply>> getFetchers(List<ClusterKey> agentKeys) {
@@ -157,10 +157,6 @@ private static Runnable decorateHandler(TimerTaskDecorator decorator, TimerTask
         return decorator.decorate(target);
     }
 
-    private static <T> Consumer<T> ignoreArgument(Runnable r) {
-        return t -> r.run();
-    }
-
     private class TickHandler extends TimerTask {
 
         private final WebSocketSession session;

diff --git a/redis/src/main/java/com/navercorp/pinpoint/redis/RedisBasicConfig.java b/redis/src/main/java/com/navercorp/pinpoint/redis/RedisBasicConfig.java
@@ -20,8 +20,6 @@
 import io.lettuce.core.TimeoutOptions;
 import io.lettuce.core.resource.ClientResources;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -60,7 +58,7 @@ public class RedisBasicConfig {
     @Value("${spring.data.redis.port:6379}")
     int port;
 
-    @Value("${spring.data.redis.cluster.nodes:@null}")
+    @Value("${spring.data.redis.cluster.nodes}")
     List<String> clusterNodes;
     @Value("${spring.data.redis.lettuce.client.io-thread-pool-size:8}")
     int lettuceIOThreadPoolSize;
@@ -86,22 +84,17 @@ ReactiveRedisTemplate<String, String> reactiveRedisTemplate(ReactiveRedisConnect
     }
 
     @Bean
-    @ConditionalOnProperty("spring.redis.cluster.nodes")
-    RedisConfiguration redisClusterConfiguration() {
-        Assert.notNull(clusterNodes, "clusterNodes are required for redis-cluster mode");
+    RedisConfiguration redisConfiguration() {
+        if (clusterNodes == null || clusterNodes.isEmpty()) {
+            Assert.hasText(host, "host is required for redis-standalone mode");
 
-        final RedisClusterConfiguration config = new RedisClusterConfiguration(clusterNodes);
-        config.setUsername(username);
-        config.setPassword(password);
-        return config;
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(RedisConfiguration.class)
-    RedisConfiguration redisStandaloneConfiguration() {
-        Assert.hasText(host, "host is required for redis-standalone mode");
+            final RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(host, port);
+            config.setUsername(username);
+            config.setPassword(password);
+            return config;
+        }
 
-        final RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(host, port);
+        final RedisClusterConfiguration config = new RedisClusterConfiguration(clusterNodes);
         config.setUsername(username);
         config.setPassword(password);
         return config;