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
+194
View File
@@ -1198,3 +1198,197 @@ hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
[2026-03-23 16:08:40] ⚠️ git pull失败,继续检查
[2026-03-23 16:08:40] simayi 无新任务
=========================================
=========================================
Agent监控启动 - simayi
Agent监控启动 - simayi
启动时间: 2026-03-23 17:25:08
启动时间: 2026-03-23 17:25:08
监控目录: management/agents/simayi
监控目录: management/agents/simayi
检查间隔: 30秒
检查间隔: 30秒
自动git pull: 每次检查前自动拉取
自动git pull: 每次检查前自动拉取
=========================================
=========================================
🚀 simayi Agent监控器启动
📊 监控目录: management/agents/simayi
📝 日志文件: simayi_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:08] ✅ git pull成功
[2026-03-23 17:25:08] ✅ git pull成功
[2026-03-23 17:25:08] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:25:39] ✅ git pull成功
[2026-03-23 17:25:39] ✅ git pull成功
[2026-03-23 17:25:39] simayi 无新任务
=========================================
=========================================
Agent监控启动 - simayi
Agent监控启动 - simayi
启动时间: 2026-03-23 17:25:44
启动时间: 2026-03-23 17:25:44
监控目录: management/agents/simayi
监控目录: management/agents/simayi
检查间隔: 30秒
检查间隔: 30秒
自动git pull: 每次检查前自动拉取
自动git pull: 每次检查前自动拉取
=========================================
=========================================
🚀 simayi Agent监控器启动
📊 监控目录: management/agents/simayi
📝 日志文件: simayi_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:44] ✅ git pull成功
[2026-03-23 17:25:44] ✅ git pull成功
[2026-03-23 17:25:44] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:09] ✅ git pull成功
[2026-03-23 17:26:09] ✅ git pull成功
[2026-03-23 17:26:09] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:15] ✅ git pull成功
[2026-03-23 17:26:15] ✅ git pull成功
[2026-03-23 17:26:15] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:40] ✅ git pull成功
[2026-03-23 17:26:40] ✅ git pull成功
[2026-03-23 17:26:40] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:26:46] ✅ git pull成功
[2026-03-23 17:26:46] ✅ git pull成功
[2026-03-23 17:26:46] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:11] ✅ git pull成功
[2026-03-23 17:27:11] ✅ git pull成功
[2026-03-23 17:27:11] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:16] ✅ git pull成功
[2026-03-23 17:27:16] ✅ git pull成功
[2026-03-23 17:27:16] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:42] ✅ git pull成功
[2026-03-23 17:27:42] ✅ git pull成功
[2026-03-23 17:27:42] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:27:47] ✅ git pull成功
[2026-03-23 17:27:47] ✅ git pull成功
[2026-03-23 17:27:47] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:13] ✅ git pull成功
[2026-03-23 17:28:13] ✅ git pull成功
[2026-03-23 17:28:13] simayi 无新任务
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:28:18] ⚠️ git pull失败,继续检查
[2026-03-23 17:28:18] ⚠️ git pull失败,继续检查
[2026-03-23 17:28:18] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:44] ✅ git pull成功
[2026-03-23 17:28:44] ✅ git pull成功
[2026-03-23 17:28:44] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:28:49] ✅ git pull成功
[2026-03-23 17:28:49] ✅ git pull成功
[2026-03-23 17:28:49] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:29:15] ✅ git pull成功
[2026-03-23 17:29:15] ✅ git pull成功
[2026-03-23 17:29:15] simayi 无新任务
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:29:20] ⚠️ git pull失败,继续检查
[2026-03-23 17:29:20] ⚠️ git pull失败,继续检查
[2026-03-23 17:29:20] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:29:46] ✅ git pull成功
[2026-03-23 17:29:46] ✅ git pull成功
[2026-03-23 17:29:46] simayi 无新任务
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:29:51] ⚠️ git pull失败,继续检查
[2026-03-23 17:29:51] ⚠️ git pull失败,继续检查
[2026-03-23 17:29:51] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:17] ✅ git pull成功
[2026-03-23 17:30:17] ✅ git pull成功
[2026-03-23 17:30:17] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:22] ✅ git pull成功
[2026-03-23 17:30:22] ✅ git pull成功
[2026-03-23 17:30:22] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:48] ✅ git pull成功
[2026-03-23 17:30:48] ✅ git pull成功
[2026-03-23 17:30:48] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:30:53] ✅ git pull成功
[2026-03-23 17:30:53] ✅ git pull成功
[2026-03-23 17:30:53] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:31:19] ✅ git pull成功
[2026-03-23 17:31:19] ✅ git pull成功
[2026-03-23 17:31:19] simayi 无新任务
From gitee.com:cfdaily/sanguo_quant_live
* branch main -> FETCH_HEAD
Already up to date.
[2026-03-23 17:31:24] ✅ git pull成功
[2026-03-23 17:31:24] ✅ git pull成功
[2026-03-23 17:31:24] simayi 无新任务