zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[agent]-[executor] redis listener container optimize

Browse Source
This commit is contained in:
IceDerce
2022-12-30 15:23:03 +08:00
parent d9a70aa059
commit adc78fa666
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent/src/main/java/io/wdd/agent/executor/config/RedisConfiguration.java
View File

@@ -19,10 +19,12 @@ public class RedisConfiguration {
redisTemplate.setConnectionFactory(redisConnectionFactory); redisTemplate.setConnectionFactory(redisConnectionFactory);
GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(); GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer();
redisTemplate.setKeySerializer(RedisSerializer.string()); redisTemplate.setKeySerializer(RedisSerializer.string());
redisTemplate.setHashKeySerializer(RedisSerializer.string()); redisTemplate.setHashKeySerializer(RedisSerializer.string());
redisTemplate.setValueSerializer(jsonRedisSerializer); redisTemplate.setValueSerializer(jsonRedisSerializer);
redisTemplate.setHashValueSerializer(jsonRedisSerializer); redisTemplate.setHashValueSerializer(jsonRedisSerializer);
return redisTemplate; return redisTemplate;
} }
} }

4
agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java
View File

@@ -100,7 +100,6 @@ public class StreamSender {
StreamSenderEntity streamSenderEntity = AllNeededStreamSender.get(streamKey); StreamSenderEntity streamSenderEntity = AllNeededStreamSender.get(streamKey);
streamSenderEntity.setWaitToSendLog(false); streamSenderEntity.setWaitToSendLog(false);
batchSendLog(streamKey); batchSendLog(streamKey);
} }
@@ -139,12 +138,11 @@ public class StreamSender {
private boolean send(String streamKey, List<String> content) { private boolean send(String streamKey, List<String> content) {
try { try {
String resultContent = objectMapper.writeValueAsString(content); String resultContent = objectMapper.writeValueAsString(content);
return this.send(streamKey, resultContent);
return this.send(streamKey, resultContent);
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
throw new RuntimeException(e); throw new RuntimeException(e);

2
agent/src/main/java/io/wdd/agent/executor/thread/LogToArrayListCache.java
View File

@@ -32,7 +32,9 @@ public class LogToArrayListCache {
ArrayList<String> commandCachedLog = this.getExecutionCmdCachedLogArrayList(streamKey); ArrayList<String> commandCachedLog = this.getExecutionCmdCachedLogArrayList(streamKey);
String format = String.format("execution command are => [ %s ]", process.info().commandLine().get()); String format = String.format("execution command are => [ %s ]", process.info().commandLine().get());
// add the command // add the command
commandCachedLog.add("");
commandCachedLog.add(format); commandCachedLog.add(format);
commandCachedLog.add("--------------- command result are as below --------------------"); commandCachedLog.add("--------------- command result are as below --------------------");
commandCachedLog.add(""); commandCachedLog.add("");