Skip to content

Commit 05d5399

Browse files
committed
[pinpoint-apm#9666] Fixed redis properties
1 parent f1a45f7 commit 05d5399

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

realtime/realtime-web/src/main/java/com/navercorp/pinpoint/web/realtime/activethread/count/websocket/ActiveThreadCountHandlerImpl.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ private Consumer<Long> makeTickHandler(SessionContext ctx, WebSocketSession sess
117117
final List<ClusterKey> agentKeys =
118118
this.agentLookupService.getRecentAgents(applicationName, TimeUnit.HOURS.toMillis(1));
119119
final TickHandler handler = new TickHandler(session, applicationName, agentKeys, getFetchers(agentKeys));
120-
121-
return ignoreArgument(decorateHandler(ctx.getTaskDecorator(), handler));
120+
final Runnable decoratedHandler = decorateHandler(ctx.getTaskDecorator(), handler);
121+
return t -> decoratedHandler.run();
122122
}
123123

124124
private List<Fetcher<ATCSupply>> getFetchers(List<ClusterKey> agentKeys) {
@@ -157,10 +157,6 @@ private static Runnable decorateHandler(TimerTaskDecorator decorator, TimerTask
157157
return decorator.decorate(target);
158158
}
159159

160-
private static <T> Consumer<T> ignoreArgument(Runnable r) {
161-
return t -> r.run();
162-
}
163-
164160
private class TickHandler extends TimerTask {
165161

166162
private final WebSocketSession session;

redis/src/main/java/com/navercorp/pinpoint/redis/RedisBasicConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ReactiveRedisTemplate<String, String> reactiveRedisTemplate(ReactiveRedisConnect
8686
}
8787

8888
@Bean
89-
@ConditionalOnProperty("spring.redis.cluster.nodes")
89+
@ConditionalOnProperty("spring.data.redis.cluster.nodes")
9090
RedisConfiguration redisClusterConfiguration() {
9191
Assert.notNull(clusterNodes, "clusterNodes are required for redis-cluster mode");
9292

0 commit comments

Comments
 (0)