fix: 修复git容错处理,修复启动脚本语法错误

This commit is contained in:
cfdaily
2026-03-23 17:31:42 +08:00
parent d8e6529ac2
commit 1522f3ead0
10 changed files with 1313 additions and 17 deletions
+190
View File
@@ -1835,3 +1835,193 @@ hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
[2026-03-23 16:08:51] ⚠️ git pull失败,继续检查
[2026-03-23 16:08:51] jiangwei 无新任务
=========================================
=========================================
Agent监控启动 - jiangwei
Agent监控启动 - jiangwei
启动时间: 2026-03-23 17:25:09
启动时间: 2026-03-23 17:25:09
监控目录: management/agents/jiangwei
监控目录: management/agents/jiangwei
检查间隔: 30秒
检查间隔: 30秒
自动git pull: 每次检查前自动拉取
自动git pull: 每次检查前自动拉取
=========================================
=========================================
🚀 jiangwei Agent监控器启动
📊 监控目录: management/agents/jiangwei
📝 日志文件: jiangwei_monitor.log
⏰ 检查间隔: 30秒
🔄 自动git pull: 每次检查前自动拉取
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:25:09] ✅ git pull成功
[2026-03-23 17:25:09] ✅ git pull成功
[2026-03-23 17:25:09] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:25:40] ✅ git pull成功
[2026-03-23 17:25:40] ✅ git pull成功
[2026-03-23 17:25:40] jiangwei 无新任务
=========================================
=========================================
Agent监控启动 - jiangwei
Agent监控启动 - jiangwei
启动时间: 2026-03-23 17:25:45
启动时间: 2026-03-23 17:25:45
监控目录: management/agents/jiangwei
监控目录: management/agents/jiangwei
检查间隔: 30秒
检查间隔: 30秒
自动git pull: 每次检查前自动拉取
自动git pull: 每次检查前自动拉取
=========================================
=========================================
🚀 jiangwei Agent监控器启动
📊 监控目录: management/agents/jiangwei
📝 日志文件: jiangwei_monitor.log
⏰ 检查间隔: 30秒
🔄 自动git pull: 每次检查前自动拉取
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:25:45] ✅ git pull成功
[2026-03-23 17:25:45] ✅ git pull成功
[2026-03-23 17:25:45] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:11] ✅ git pull成功
[2026-03-23 17:26:11] ✅ git pull成功
[2026-03-23 17:26:11] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:16] ✅ git pull成功
[2026-03-23 17:26:16] ✅ git pull成功
[2026-03-23 17:26:16] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:42] ✅ git pull成功
[2026-03-23 17:26:42] ✅ git pull成功
[2026-03-23 17:26:42] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:47] ✅ git pull成功
[2026-03-23 17:26:47] ✅ git pull成功
[2026-03-23 17:26:47] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:12] ✅ git pull成功
[2026-03-23 17:27:12] ✅ git pull成功
[2026-03-23 17:27:12] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:17] ✅ git pull成功
[2026-03-23 17:27:17] ✅ git pull成功
[2026-03-23 17:27:17] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:43] ✅ git pull成功
[2026-03-23 17:27:43] ✅ git pull成功
[2026-03-23 17:27:43] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:48] ✅ git pull成功
[2026-03-23 17:27:48] ✅ git pull成功
[2026-03-23 17:27:48] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:14] ✅ git pull成功
[2026-03-23 17:28:14] ✅ git pull成功
[2026-03-23 17:28:14] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:19] ✅ git pull成功
[2026-03-23 17:28:19] ✅ git pull成功
[2026-03-23 17:28:19] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:45] ✅ git pull成功
[2026-03-23 17:28:45] ✅ git pull成功
[2026-03-23 17:28:45] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:50] ✅ git pull成功
[2026-03-23 17:28:50] ✅ git pull成功
[2026-03-23 17:28:50] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:29:16] ✅ git pull成功
[2026-03-23 17:29:16] ✅ git pull成功
[2026-03-23 17:29:16] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:29:21] ✅ git pull成功
[2026-03-23 17:29:21] ✅ git pull成功
[2026-03-23 17:29:21] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:29:47] ✅ git pull成功
[2026-03-23 17:29:47] ✅ git pull成功
[2026-03-23 17:29:47] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:29:52] ✅ git pull成功
[2026-03-23 17:29:52] ✅ git pull成功
[2026-03-23 17:29:52] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
There are no candidates for merging among the refs that you just fetched.
Generally this means that you provided a wildcard refspec which had no
matches on the remote end.
[2026-03-23 17:30:18] ⚠️ git pull失败,继续检查
[2026-03-23 17:30:18] ⚠️ git pull失败,继续检查
[2026-03-23 17:30:18] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:23] ✅ git pull成功
[2026-03-23 17:30:23] ✅ git pull成功
[2026-03-23 17:30:23] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:49] ✅ git pull成功
[2026-03-23 17:30:49] ✅ git pull成功
[2026-03-23 17:30:49] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:54] ✅ git pull成功
[2026-03-23 17:30:54] ✅ git pull成功
[2026-03-23 17:30:54] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:31:20] ✅ git pull成功
[2026-03-23 17:31:20] ✅ git pull成功
[2026-03-23 17:31:20] jiangwei 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:31:25] ✅ git pull成功
[2026-03-23 17:31:25] ✅ git pull成功
[2026-03-23 17:31:25] jiangwei 无新任务