From adc78fa6667453a9f4fd55df32454e0aab7f6fd9 Mon Sep 17 00:00:00 2001 From: IceDerce Date: Fri, 30 Dec 2022 15:23:03 +0800 Subject: [PATCH] [agent]-[executor] redis listener container optimize --- .../java/io/wdd/agent/executor/config/RedisConfiguration.java | 2 ++ .../main/java/io/wdd/agent/executor/redis/StreamSender.java | 4 +--- .../io/wdd/agent/executor/thread/LogToArrayListCache.java | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/agent/src/main/java/io/wdd/agent/executor/config/RedisConfiguration.java b/agent/src/main/java/io/wdd/agent/executor/config/RedisConfiguration.java index d17dc8d..4d12a86 100644 --- a/agent/src/main/java/io/wdd/agent/executor/config/RedisConfiguration.java +++ b/agent/src/main/java/io/wdd/agent/executor/config/RedisConfiguration.java @@ -19,10 +19,12 @@ public class RedisConfiguration { redisTemplate.setConnectionFactory(redisConnectionFactory); GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(); + redisTemplate.setKeySerializer(RedisSerializer.string()); redisTemplate.setHashKeySerializer(RedisSerializer.string()); redisTemplate.setValueSerializer(jsonRedisSerializer); redisTemplate.setHashValueSerializer(jsonRedisSerializer); + return redisTemplate; } } diff --git a/agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java b/agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java index da2d4f0..9728c22 100644 --- a/agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java +++ b/agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java @@ -100,7 +100,6 @@ public class StreamSender { StreamSenderEntity streamSenderEntity = AllNeededStreamSender.get(streamKey); streamSenderEntity.setWaitToSendLog(false); - batchSendLog(streamKey); } @@ -139,12 +138,11 @@ public class StreamSender { private boolean send(String streamKey, List content) { - try { String resultContent = objectMapper.writeValueAsString(content); - return this.send(streamKey, resultContent); + return this.send(streamKey, resultContent); } catch (JsonProcessingException e) { throw new RuntimeException(e); diff --git a/agent/src/main/java/io/wdd/agent/executor/thread/LogToArrayListCache.java b/agent/src/main/java/io/wdd/agent/executor/thread/LogToArrayListCache.java index ce340b0..a3523a6 100644 --- a/agent/src/main/java/io/wdd/agent/executor/thread/LogToArrayListCache.java +++ b/agent/src/main/java/io/wdd/agent/executor/thread/LogToArrayListCache.java @@ -32,7 +32,9 @@ public class LogToArrayListCache { ArrayList commandCachedLog = this.getExecutionCmdCachedLogArrayList(streamKey); String format = String.format("execution command are => [ %s ]", process.info().commandLine().get()); + // add the command + commandCachedLog.add(""); commandCachedLog.add(format); commandCachedLog.add("--------------- command result are as below --------------------"); commandCachedLog.add("");