From 30caa38e7102c992908495be999f3c8f5e686245 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Thu, 16 Feb 2023 16:31:09 +0800
Subject: [PATCH] =?UTF-8?q?[server]=20=20-=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/AgentOperationInfoService.java      |  2 +-
 .../handler/OctopusMessageHandler.java        |  2 +-
 .../java/io/wdd/source/shell/agent-bootup.sh  | 40 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/agent/src/main/java/io/wdd/agent/agent/AgentOperationInfoService.java b/agent/src/main/java/io/wdd/agent/agent/AgentOperationInfoService.java
index 554065c..b3663e0 100644
--- a/agent/src/main/java/io/wdd/agent/agent/AgentOperationInfoService.java
+++ b/agent/src/main/java/io/wdd/agent/agent/AgentOperationInfoService.java
@@ -32,7 +32,7 @@ public class AgentOperationInfoService {
         // 需要此部分写为String, 否则无法解析
         String agentServerInfoString;
         try {
-            agentServerInfoString = objectMapper.writeValueAsString(objectMapper);
+            agentServerInfoString = objectMapper.writeValueAsString(agentServerInfo);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java b/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java
index 855a0b0..2175ab8 100644
--- a/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java
+++ b/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java
@@ -55,7 +55,7 @@ public class OctopusMessageHandler {
         }
 
         // Octopus Message Handler
-        log.info(
+        log.debug(
                 "received from agent : {} ",
                 octopusMessage
         );
diff --git a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh
index c8d7a9e..c4e91dc 100644
--- a/source/src/main/java/io/wdd/source/shell/agent-bootup.sh
+++ b/source/src/main/java/io/wdd/source/shell/agent-bootup.sh
@@ -2,7 +2,7 @@
 
 #####  environment variables ######
 
-JAVA_OPTS="-Xms128m -Xmx512m  -Dfile.encoding=utf-8  --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s"
+JAVA_OPTS="-Xms128m -Xmx512m -Ddebug=false -Dfile.encoding=utf-8  --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s"
 
 DependLibFiles=(
   wdd-lib-file.sh
@@ -341,6 +341,7 @@ InstallJDKPackage() {
 systemdAgent() {
 
   #  https://www.baeldung.com/linux/run-java-application-as-service
+  colorEcho $BLUE "[守护]-开始设置Agent的守护进程"
 
   cat >/etc/systemd/system/octopus-agent.service <<EOF
 [Unit]
@@ -563,6 +564,16 @@ EOF
   FunctionSuccess
 }
 
+#######################################
+# description
+# Globals:
+#   BLUE
+#   GREEN
+#   PURPLE
+#   RED
+# Arguments:
+#  None
+#######################################
 ChangeTimeZoneAndNTP() {
   FunctionStart
   colorEcho ${BLUE} "开始使用 timedatectl 工具进行时间同步…………"
@@ -584,6 +595,31 @@ ChangeTimeZoneAndNTP() {
   FunctionEnd
 }
 
+#######################################
+# description
+# Arguments:
+#  None
+#######################################
+CleanOldOctopusAgent() {
+    FunctionStart
+
+    colorEcho $BLUE "start to kill old octopus-agent"
+
+    agentPid=$(ps -ef | grep -v "color="| grep -c "octopus-agent")
+    if [[ $agentPid -gt 0 ]]; then
+        colorEcho $BLUE "old agent existed ! start to kill"
+        systemctl stop octopus-agent
+        sleep 2
+        systemctl disable octopus-agent
+
+        rm -rf /etc/systemd/system/octopus-agent.service
+
+    fi
+
+    FunctionSuccess
+    FunctionEnd
+}
+
 #######################################
 # description
 # Arguments:
@@ -600,6 +636,8 @@ main() {
 
   InstallJDKPackage 11
 
+  CleanOldOctopusAgent
+
   DownloadAllFile
 
   ChangeTimeZoneAndNTP