From cf7775bf65cb7548eca0a0e098d1a2164fafd579 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Fri, 30 Dec 2022 16:45:04 +0800
Subject: [PATCH] [ agent ] [ agent ] - agent bootup optimize - 2

---
 .github/workflows/build-push-docker.yml                        | 1 +
 agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java | 1 +
 source/src/main/java/io/wdd/source/shell/agent-update.sh       | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml
index 14b0d63..3d3b7c8 100644
--- a/.github/workflows/build-push-docker.yml
+++ b/.github/workflows/build-push-docker.yml
@@ -131,6 +131,7 @@ jobs:
           echo "start to change timezone to Asia/Shanghai"
           timedatectl set-timezone Asia/Shanghai && timedatectl set-ntp true
           echo "current time is $(date --rfc-3339=seconds | cut -d"+" -f1 | sed "s/ /-/g" | sed "s/:/-/g")"
+          echo "current time is $(date)"
           echo "start to copy target jar" 
           cp ./agent-*.jar ./octopus-agent-$(date --rfc-3339=seconds | cut -d"+" -f1 | sed "s/ /-/g" | sed "s/:/-/g").jar
           cd /home/runner/work/ProjectOctopus/ProjectOctopus
diff --git a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
index b010ac2..ff477ed 100644
--- a/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
+++ b/agent/src/main/java/io/wdd/agent/executor/CommandExecutor.java
@@ -87,6 +87,7 @@ public class CommandExecutor {
             // start to send the result log
             streamSender.startToWaitLog(streamKey);
 
+            // todo this will stuck the process and rabbitmq message will reentry the queue
             // get the command result must also be a timeout smaller than the process
             boolean waitFor = process.waitFor(50, TimeUnit.SECONDS);
 
diff --git a/source/src/main/java/io/wdd/source/shell/agent-update.sh b/source/src/main/java/io/wdd/source/shell/agent-update.sh
index 3d570ab..ab0014f 100644
--- a/source/src/main/java/io/wdd/source/shell/agent-update.sh
+++ b/source/src/main/java/io/wdd/source/shell/agent-update.sh
@@ -14,7 +14,7 @@ CheckAndDownloadLatestVersion
 if [[ ! -f /octopus-agent/shell/agent-restart.sh ]]; then
   warn "agent-bootup.sh not exist! start to download !"
   cd /octopus-agent/shell
-  wget $RepoSourcePath/agent-restart.sh
+  wget -q $RepoSourcePath/agent-restart.sh
 fi