sanguo/sanguo_quant_live
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并修复路径计算和进程检测错误

Browse Source
This commit is contained in:
cfdaily
2026-03-23 10:39:25 +08:00
parent 132af78f2e e80cc914b7
commit 951bad4410
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/workflow/scripts/agent_auto_start.sh
+3 -2
View File
@@ -11,7 +11,8 @@ if [ -z "$AGENT_NAME" ]; then
fi fi
# 项目目录：自动检测脚本所在位置，不需要硬编码 # 项目目录：自动检测脚本所在位置，不需要硬编码
# scripts -> workflow -> management -> 项目根目录（向上跳3级） # SCRIPT_DIR: .../sanguo_quant_live/management/workflow/scripts
# 三次 dirname 回到项目根目录
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")" PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")"
cd "$PROJECT_ROOT" || { cd "$PROJECT_ROOT" || {
@@ -25,7 +26,7 @@ if ps aux | grep "agent_monitor_fixed.sh $AGENT_NAME" | grep -v grep | grep -q .
exit 0 exit 0
fi fi
# 启动全自动化监控（集成git pull + 任务发现 + 自动推送） # 启动全自动化监控（集成git pull/处理/git push）
echo "🚀 启动 $AGENT_NAME 监控..." echo "🚀 启动 $AGENT_NAME 监控..."
nohup ./management/workflow/scripts/agent_monitor_fixed.sh "$AGENT_NAME" > "${AGENT_NAME}_monitor.log" 2>&1 & nohup ./management/workflow/scripts/agent_monitor_fixed.sh "$AGENT_NAME" > "${AGENT_NAME}_monitor.log" 2>&1 &
management/workflow/scripts/agent_monitor_fixed.sh
+2 -1
View File
@@ -11,7 +11,8 @@ if [ -z "$AGENT" ]; then
fi fi
# 自动检测项目根目录 # 自动检测项目根目录
# scripts -> workflow -> management -> 项目根目录（向上跳3级） # SCRIPT_DIR: .../sanguo_quant_live/management/workflow/scripts
# 三次 dirname 回到项目根目录
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")" PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")"
cd "$PROJECT_ROOT" || { cd "$PROJECT_ROOT" || {
management/workflow/scripts/agent_monitor_gitpull.sh
+2 -1
View File
@@ -13,7 +13,8 @@ if [ -z "$AGENT_NAME" ]; then
fi fi
# 项目根目录（自动检测，基于脚本位置） # 项目根目录（自动检测，基于脚本位置）
# scripts -> workflow -> management -> 项目根目录（向上跳3级） # SCRIPT_DIR: .../sanguo_quant_live/management/workflow/scripts
# 三次 dirname 回到项目根目录
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")" PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")"
cd "$PROJECT_ROOT" || { cd "$PROJECT_ROOT" || {