Compare commits
14 Commits
7ac5d54a84
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 23c88b5f48 | |||
| c9c4da01b6 | |||
| 7a104bbe42 | |||
| e0d97c4486 | |||
| bb73e0f384 | |||
| b5fc83065c | |||
| ef31a054c0 | |||
| ff35510ef0 | |||
| 21592ae8a0 | |||
| f01547df35 | |||
| 4a2532a83b | |||
| b962265168 | |||
| 38acca6484 | |||
| 8d36ef495d |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@ agent
|
|||||||
node.log
|
node.log
|
||||||
node.pid
|
node.pid
|
||||||
config.yaml
|
config.yaml
|
||||||
|
.DS_Store
|
||||||
|
|||||||
98
INSTALL.md
98
INSTALL.md
@@ -37,13 +37,17 @@ GITHUB_BRANCH=develop curl -fsSL https://raw.githubusercontent.com/yourbask/link
|
|||||||
|
|
||||||
1. **检测系统** - 自动识别 Linux 发行版和 CPU 架构
|
1. **检测系统** - 自动识别 Linux 发行版和 CPU 架构
|
||||||
2. **安装依赖** - 自动安装 Git、Go、ping、traceroute、dnsutils 等工具
|
2. **安装依赖** - 自动安装 Git、Go、ping、traceroute、dnsutils 等工具
|
||||||
3. **克隆源码** - 从 GitHub 克隆 node 项目源码到 `/opt/linkmaster-node`
|
3. **下载发布包** - 从 Releases 下载预编译发布包(包含二进制文件和所有脚本)
|
||||||
4. **编译安装** - 自动编译源码并安装二进制文件
|
4. **提取文件** - 从发布包提取所有文件到 `/opt/linkmaster-node`(无需克隆 Git)
|
||||||
5. **创建服务** - 自动创建 systemd 服务文件(使用 run.sh 启动)
|
5. **编译安装** - 如果下载失败,自动从源码编译安装
|
||||||
6. **启动服务** - 自动启动并设置开机自启
|
6. **创建服务** - 自动创建 systemd 服务文件(使用 run.sh 启动)
|
||||||
7. **验证安装** - 检查服务状态和健康检查
|
7. **启动服务** - 自动启动并设置开机自启
|
||||||
|
8. **验证安装** - 检查服务状态和健康检查
|
||||||
|
|
||||||
**注意:** 每次服务启动时会自动拉取最新代码并重新编译,确保使用最新版本。
|
**重要说明:**
|
||||||
|
- ✅ **新格式发布包**:包含二进制文件、安装脚本、运行脚本等所有必要文件,安装时直接从压缩包提取,无需克隆 Git 仓库
|
||||||
|
- ✅ **向后兼容**:如果发布包是旧格式(仅包含二进制文件),安装脚本会自动从 Git 克隆获取脚本文件
|
||||||
|
- ⚠️ **源码编译模式**:如果下载失败,会从 Git 克隆源码并编译(需要网络连接)
|
||||||
|
|
||||||
## 安装后管理
|
## 安装后管理
|
||||||
|
|
||||||
@@ -109,7 +113,37 @@ curl http://localhost:2200/api/health
|
|||||||
|
|
||||||
如果无法使用一键安装脚本,可以手动安装:
|
如果无法使用一键安装脚本,可以手动安装:
|
||||||
|
|
||||||
### 1. 克隆源码并编译
|
### 方式一:从发布包安装(推荐)
|
||||||
|
|
||||||
|
**优点**:无需 Git 和 Go 环境,直接使用预编译文件
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. 下载发布包(替换为实际版本和平台)
|
||||||
|
wget https://gitee.nas.cpolar.cn/yoyo/linkmaster-node/releases/download/v1.1.4/agent-linux-amd64-v1.1.4.tar.gz
|
||||||
|
|
||||||
|
# 2. 解压
|
||||||
|
tar -xzf agent-linux-amd64-v1.1.4.tar.gz
|
||||||
|
cd agent-linux-amd64-v1.1.4
|
||||||
|
|
||||||
|
# 3. 复制文件到安装目录
|
||||||
|
sudo mkdir -p /opt/linkmaster-node
|
||||||
|
sudo cp -r * /opt/linkmaster-node/
|
||||||
|
sudo chmod +x /opt/linkmaster-node/agent
|
||||||
|
sudo chmod +x /opt/linkmaster-node/*.sh
|
||||||
|
|
||||||
|
# 4. 复制二进制文件到系统目录
|
||||||
|
sudo cp /opt/linkmaster-node/agent /usr/local/bin/linkmaster-node
|
||||||
|
sudo chmod +x /usr/local/bin/linkmaster-node
|
||||||
|
|
||||||
|
# 5. 创建配置文件(从示例复制)
|
||||||
|
sudo cp /opt/linkmaster-node/config.yaml.example /opt/linkmaster-node/config.yaml
|
||||||
|
# 编辑配置文件,设置后端地址
|
||||||
|
sudo nano /opt/linkmaster-node/config.yaml
|
||||||
|
|
||||||
|
# 6. 创建 systemd 服务(参考下面的服务配置)
|
||||||
|
```
|
||||||
|
|
||||||
|
### 方式二:克隆源码并编译
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 克隆仓库
|
# 克隆仓库
|
||||||
@@ -169,6 +203,43 @@ EOF
|
|||||||
|
|
||||||
**注意:** 使用 `run.sh` 启动的好处是每次启动会自动拉取最新代码并重新编译。
|
**注意:** 使用 `run.sh` 启动的好处是每次启动会自动拉取最新代码并重新编译。
|
||||||
|
|
||||||
|
### 3.1. 配置说明
|
||||||
|
|
||||||
|
**配置优先级(从高到低):**
|
||||||
|
1. 环境变量 `BACKEND_URL`(最高优先级)
|
||||||
|
2. 配置文件 `config.yaml` 中的 `backend.url`
|
||||||
|
3. 默认值
|
||||||
|
|
||||||
|
**重要说明:**
|
||||||
|
- 环境变量 `BACKEND_URL` 会**覆盖**配置文件中的设置
|
||||||
|
- 即使配置文件存在,设置环境变量后也会优先使用环境变量的值
|
||||||
|
- 这确保了编译后的二进制文件不会硬编码后端地址
|
||||||
|
- 配置文件不会被编译进二进制文件,是运行时读取的
|
||||||
|
|
||||||
|
**使用环境变量(推荐):**
|
||||||
|
```bash
|
||||||
|
# 在 systemd 服务文件中设置
|
||||||
|
Environment="BACKEND_URL=http://your-backend-server:8080"
|
||||||
|
|
||||||
|
# 或在命令行中设置
|
||||||
|
BACKEND_URL=http://your-backend-server:8080 ./run.sh start
|
||||||
|
```
|
||||||
|
|
||||||
|
**使用配置文件:**
|
||||||
|
创建 `/opt/linkmaster-node/config.yaml`:
|
||||||
|
```yaml
|
||||||
|
server:
|
||||||
|
port: 2200
|
||||||
|
backend:
|
||||||
|
url: http://your-backend-server:8080
|
||||||
|
heartbeat:
|
||||||
|
interval: 60
|
||||||
|
log:
|
||||||
|
file: node.log
|
||||||
|
level: info
|
||||||
|
debug: false
|
||||||
|
```
|
||||||
|
|
||||||
### 4. 启动服务
|
### 4. 启动服务
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -177,7 +248,11 @@ sudo systemctl enable linkmaster-node
|
|||||||
sudo systemctl start linkmaster-node
|
sudo systemctl start linkmaster-node
|
||||||
```
|
```
|
||||||
|
|
||||||
**注意:** 确保 `BACKEND_URL` 环境变量指向后端服务器的实际地址和端口(默认 8080),不是前端地址。
|
**重要说明:**
|
||||||
|
- 确保 `BACKEND_URL` 环境变量指向后端服务器的实际地址和端口(默认 8080),不是前端地址
|
||||||
|
- `BACKEND_URL` 环境变量会**覆盖**配置文件中的 `backend.url` 设置(优先级最高)
|
||||||
|
- 即使配置文件存在,设置环境变量后也会优先使用环境变量的值
|
||||||
|
- 这确保了编译后的二进制文件不会硬编码后端地址
|
||||||
|
|
||||||
## 防火墙配置
|
## 防火墙配置
|
||||||
|
|
||||||
@@ -238,12 +313,19 @@ sudo lsof -i :2200
|
|||||||
|
|
||||||
**解决:**
|
**解决:**
|
||||||
- 检查后端地址是否正确(应该是 `http://backend-server:8080`,不是前端地址)
|
- 检查后端地址是否正确(应该是 `http://backend-server:8080`,不是前端地址)
|
||||||
|
- 检查环境变量 `BACKEND_URL` 是否设置正确(优先级最高)
|
||||||
|
- 检查配置文件 `config.yaml` 中的 `backend.url` 是否正确
|
||||||
- 检查网络连通性:`ping your-backend-server`
|
- 检查网络连通性:`ping your-backend-server`
|
||||||
- 检查端口是否开放:`telnet your-backend-server 8080` 或 `nc -zv your-backend-server 8080`
|
- 检查端口是否开放:`telnet your-backend-server 8080` 或 `nc -zv your-backend-server 8080`
|
||||||
- 检查防火墙规则(确保后端服务器的 8080 端口开放)
|
- 检查防火墙规则(确保后端服务器的 8080 端口开放)
|
||||||
- 检查后端服务是否运行:`curl http://your-backend-server:8080/api/public/nodes/online`
|
- 检查后端服务是否运行:`curl http://your-backend-server:8080/api/public/nodes/online`
|
||||||
- 如果使用前端代理,节点端仍需要直接连接后端,不能使用前端地址
|
- 如果使用前端代理,节点端仍需要直接连接后端,不能使用前端地址
|
||||||
|
|
||||||
|
**配置优先级说明:**
|
||||||
|
- 环境变量 `BACKEND_URL` 优先级最高,会覆盖配置文件中的设置
|
||||||
|
- 如果同时设置了环境变量和配置文件,优先使用环境变量的值
|
||||||
|
- 这确保了编译后的二进制文件不会硬编码后端地址
|
||||||
|
|
||||||
## 卸载
|
## 卸载
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
101
README.md
101
README.md
@@ -85,12 +85,25 @@ BACKEND_URL=http://your-backend-server:8080 ./run.sh start
|
|||||||
|
|
||||||
## 配置
|
## 配置
|
||||||
|
|
||||||
|
### 配置优先级
|
||||||
|
|
||||||
|
配置按以下优先级加载(高优先级会覆盖低优先级):
|
||||||
|
|
||||||
|
1. **环境变量**(最高优先级)
|
||||||
|
2. **配置文件** `config.yaml`
|
||||||
|
3. **默认值**
|
||||||
|
|
||||||
### 环境变量
|
### 环境变量
|
||||||
|
|
||||||
- `BACKEND_URL`: 后端服务地址(必需,默认: http://localhost:8080)
|
- `BACKEND_URL`: 后端服务地址(**优先级最高**,会覆盖配置文件中的设置)
|
||||||
- `CONFIG_PATH`: 配置文件路径(可选,默认: config.yaml)
|
- `CONFIG_PATH`: 配置文件路径(可选,默认: config.yaml)
|
||||||
- `LOG_FILE`: 日志文件路径(可选,默认: node.log)
|
- `LOG_FILE`: 日志文件路径(可选,默认: node.log)
|
||||||
|
|
||||||
|
**重要说明:**
|
||||||
|
- `BACKEND_URL` 环境变量会**覆盖**配置文件中的 `backend.url` 设置
|
||||||
|
- 即使配置文件存在,设置环境变量后也会优先使用环境变量的值
|
||||||
|
- 这确保了编译后的二进制文件不会硬编码后端地址
|
||||||
|
|
||||||
### 配置文件(可选)
|
### 配置文件(可选)
|
||||||
|
|
||||||
创建 `config.yaml` 文件:
|
创建 `config.yaml` 文件:
|
||||||
@@ -99,20 +112,28 @@ BACKEND_URL=http://your-backend-server:8080 ./run.sh start
|
|||||||
server:
|
server:
|
||||||
port: 2200
|
port: 2200
|
||||||
backend:
|
backend:
|
||||||
url: http://your-backend-server:8080
|
url: http://your-backend-server:8080 # 会被 BACKEND_URL 环境变量覆盖
|
||||||
heartbeat:
|
heartbeat:
|
||||||
interval: 60
|
interval: 60
|
||||||
log:
|
log:
|
||||||
file: node.log # 日志文件路径(默认: node.log,空则输出到标准错误)
|
file: node.log # 日志文件路径(默认: node.log,空则输出到标准错误)
|
||||||
level: info # 日志级别: debug, info, warn, error(默认: info)
|
level: info # 日志级别: debug, info, warn, error(默认: info)
|
||||||
debug: false
|
debug: false
|
||||||
|
node:
|
||||||
|
id: 0 # 节点ID(通过心跳自动获取)
|
||||||
|
ip: "" # 节点IP(通过心跳自动获取)
|
||||||
|
country: "" # 国家(通过心跳自动获取)
|
||||||
|
province: "" # 省份(通过心跳自动获取)
|
||||||
|
city: "" # 城市(通过心跳自动获取)
|
||||||
|
isp: "" # ISP(通过心跳自动获取)
|
||||||
```
|
```
|
||||||
|
|
||||||
**日志配置说明:**
|
**配置说明:**
|
||||||
|
- `backend.url`: 后端服务地址,会被 `BACKEND_URL` 环境变量覆盖
|
||||||
- `log.file`: 日志文件路径。如果为空,日志将输出到标准错误(stderr)
|
- `log.file`: 日志文件路径。如果为空,日志将输出到标准错误(stderr)
|
||||||
- `log.level`: 日志级别,支持 `debug`、`info`、`warn`、`error`
|
- `log.level`: 日志级别,支持 `debug`、`info`、`warn`、`error`
|
||||||
- 也可以通过环境变量 `LOG_FILE` 设置日志文件路径
|
- `node.*`: 节点信息通过心跳自动获取并保存,无需手动配置
|
||||||
- 日志文件会自动创建,如果目录不存在会自动创建
|
- 配置文件不会被编译进二进制文件,是运行时读取的
|
||||||
|
|
||||||
## 运行脚本
|
## 运行脚本
|
||||||
|
|
||||||
@@ -175,6 +196,7 @@ GITHUB_BRANCH=develop curl -fsSL https://gitee.nas.cpolar.cn/yoyo/linkmaster-nod
|
|||||||
- 自动安装系统依赖(curl, wget, git, ping, traceroute 等)
|
- 自动安装系统依赖(curl, wget, git, ping, traceroute 等)
|
||||||
- 自动安装 Go 环境(优先使用系统包管理器,失败则从官网下载)
|
- 自动安装 Go 环境(优先使用系统包管理器,失败则从官网下载)
|
||||||
- 优先从 Releases 下载预编译二进制文件,失败则从源码编译
|
- 优先从 Releases 下载预编译二进制文件,失败则从源码编译
|
||||||
|
- **发布包包含所有必要文件**:二进制文件、安装脚本、运行脚本等,无需从 Git 拉取
|
||||||
- 自动创建 systemd 服务并配置自启动
|
- 自动创建 systemd 服务并配置自启动
|
||||||
- 自动配置防火墙规则(开放 2200 端口)
|
- 自动配置防火墙规则(开放 2200 端口)
|
||||||
- 自动登记节点到后端服务器
|
- 自动登记节点到后端服务器
|
||||||
@@ -337,8 +359,8 @@ BACKEND_URL=http://192.168.1.100:8080 ./run.sh start
|
|||||||
版本号统一从 `version.json` 文件读取:
|
版本号统一从 `version.json` 文件读取:
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"version": "1.1.0",
|
"version": "1.1.3",
|
||||||
"tag": "v1.1.0"
|
"tag": "v1.1.3"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -390,6 +412,7 @@ BACKEND_URL=http://192.168.1.100:8080 ./run.sh start
|
|||||||
**功能特性:**
|
**功能特性:**
|
||||||
- ✅ **自动从 `version.json` 读取版本号和标签**(无需手动指定)
|
- ✅ **自动从 `version.json` 读取版本号和标签**(无需手动指定)
|
||||||
- ✅ **Token 已硬编码**(无需手动指定)
|
- ✅ **Token 已硬编码**(无需手动指定)
|
||||||
|
- ✅ **自动打包所有必要文件**:二进制文件、安装脚本、运行脚本、配置文件等
|
||||||
- ✅ 自动打包二进制文件(tar.gz 或 zip)
|
- ✅ 自动打包二进制文件(tar.gz 或 zip)
|
||||||
- ✅ 自动创建发布说明
|
- ✅ 自动创建发布说明
|
||||||
- ✅ 支持指定平台上传
|
- ✅ 支持指定平台上传
|
||||||
@@ -414,8 +437,8 @@ BACKEND_URL=http://192.168.1.100:8080 ./run.sh start
|
|||||||
版本号和标签统一从 `version.json` 文件读取:
|
版本号和标签统一从 `version.json` 文件读取:
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"version": "1.1.0",
|
"version": "1.1.3",
|
||||||
"tag": "v1.1.0"
|
"tag": "v1.1.3"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -603,9 +626,67 @@ grep -i "error" node.log
|
|||||||
tail -n 100 node.log
|
tail -n 100 node.log
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## 心跳机制
|
||||||
|
|
||||||
|
节点会定期向后端发送心跳,上报节点状态和获取节点信息。
|
||||||
|
|
||||||
|
### 心跳请求字段
|
||||||
|
|
||||||
|
心跳请求包含以下字段:
|
||||||
|
|
||||||
|
- `type`: 固定值 `pingServer`
|
||||||
|
- `version`: 协议版本号,固定值 `2`
|
||||||
|
- `host_name`: 节点主机名(自动读取系统主机名)
|
||||||
|
|
||||||
|
### 心跳响应
|
||||||
|
|
||||||
|
心跳响应包含以下节点信息:
|
||||||
|
|
||||||
|
- `node_id`: 节点ID
|
||||||
|
- `node_ip`: 节点外网IP
|
||||||
|
- `country`: 国家
|
||||||
|
- `province`: 省份
|
||||||
|
- `city`: 城市
|
||||||
|
- `isp`: ISP
|
||||||
|
|
||||||
|
这些信息会自动保存到配置文件中,用于后续的数据推送。
|
||||||
|
|
||||||
|
## 持续测试功能
|
||||||
|
|
||||||
|
节点支持持续 Ping 和 TCPing 测试,测试结果会自动推送到后端服务器。
|
||||||
|
|
||||||
|
### 功能特性
|
||||||
|
|
||||||
|
- ✅ 实时推送测试结果到后端
|
||||||
|
- ✅ 批量推送优化(减少HTTP请求频率)
|
||||||
|
- ✅ 自动清理超时任务
|
||||||
|
- ✅ 资源自动清理(防止内存泄漏)
|
||||||
|
- ✅ 详细的调试日志(debug模式)
|
||||||
|
|
||||||
|
### 数据推送
|
||||||
|
|
||||||
|
- 测试结果会自动推送到后端 `/api/public/node/continuous/result` 接口
|
||||||
|
- 推送包含节点ID、IP、位置信息和测试结果
|
||||||
|
- 如果后端任务不存在,节点端会自动停止对应任务
|
||||||
|
|
||||||
## 更新日志
|
## 更新日志
|
||||||
|
|
||||||
### v1.1.0 (最新)
|
### v1.1.4 (最新)
|
||||||
|
|
||||||
|
**新增功能:**
|
||||||
|
- ✨ 心跳请求新增 `version` 字段(协议版本号,默认值:2)
|
||||||
|
- ✨ 心跳请求新增 `host_name` 字段(自动读取系统主机名)
|
||||||
|
- ✨ 支持环境变量 `BACKEND_URL` 覆盖配置文件中的后端地址
|
||||||
|
- ✨ 持续测试功能增强,支持批量推送和自动清理
|
||||||
|
|
||||||
|
**改进:**
|
||||||
|
- 🔧 修复持续测试数据推送的锁管理问题
|
||||||
|
- 🔧 修复任务停止时未清理推送缓冲的内存泄漏问题
|
||||||
|
- 🔧 优化配置加载逻辑,环境变量优先级最高
|
||||||
|
- 🔧 增强日志记录,添加详细的调试信息
|
||||||
|
- 📝 完善文档,添加配置优先级和心跳机制说明
|
||||||
|
|
||||||
|
### v1.1.3
|
||||||
|
|
||||||
**新增功能:**
|
**新增功能:**
|
||||||
- ✨ 添加日志文件输出功能,支持配置日志文件路径和级别
|
- ✨ 添加日志文件输出功能,支持配置日志文件路径和级别
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ BUILD_DIR="bin"
|
|||||||
RELEASE_DIR="release"
|
RELEASE_DIR="release"
|
||||||
TEMP_DIR=$(mktemp -d)
|
TEMP_DIR=$(mktemp -d)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Gitea Token (硬编码)
|
# Gitea Token (硬编码)
|
||||||
GITEA_TOKEN="3becb08eee31b422481ce1b8986de1cd645b468e"
|
GITEA_TOKEN="3becb08eee31b422481ce1b8986de1cd645b468e"
|
||||||
|
|
||||||
@@ -277,16 +279,52 @@ pack_files() {
|
|||||||
local pack_name="${PROJECT_NAME}-${os}-${arch}-${VERSION}"
|
local pack_name="${PROJECT_NAME}-${os}-${arch}-${VERSION}"
|
||||||
local pack_file
|
local pack_file
|
||||||
|
|
||||||
|
# 创建临时打包目录
|
||||||
|
local pack_dir="${TEMP_DIR}/${pack_name}"
|
||||||
|
mkdir -p "$pack_dir"
|
||||||
|
|
||||||
|
# 复制二进制文件并重命名为 agent
|
||||||
|
if [ "$os" = "windows" ]; then
|
||||||
|
cp "$binary" "$pack_dir/agent.exe"
|
||||||
|
else
|
||||||
|
cp "$binary" "$pack_dir/agent"
|
||||||
|
chmod +x "$pack_dir/agent"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 复制必要的脚本文件
|
||||||
|
local scripts=("install.sh" "run.sh" "start-systemd.sh" "uninstall.sh")
|
||||||
|
for script in "${scripts[@]}"; do
|
||||||
|
if [ -f "$script" ]; then
|
||||||
|
cp "$script" "$pack_dir/"
|
||||||
|
chmod +x "$pack_dir/$script"
|
||||||
|
echo -e "${BLUE} [包含]${NC} $script"
|
||||||
|
else
|
||||||
|
echo -e "${YELLOW} [警告]${NC} $script 不存在,跳过"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# 复制示例配置文件
|
||||||
|
if [ -f "config.yaml.example" ]; then
|
||||||
|
cp "config.yaml.example" "$pack_dir/config.yaml.example"
|
||||||
|
echo -e "${BLUE} [包含]${NC} config.yaml.example"
|
||||||
|
else
|
||||||
|
echo -e "${YELLOW} [警告]${NC} config.yaml.example 不存在,跳过"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 打包
|
||||||
if [ "$os" = "windows" ]; then
|
if [ "$os" = "windows" ]; then
|
||||||
pack_file="${TEMP_DIR}/${pack_name}.zip"
|
pack_file="${TEMP_DIR}/${pack_name}.zip"
|
||||||
echo -e "${BLUE}[打包]${NC} ${platform} -> ${pack_name}.zip"
|
echo -e "${BLUE}[打包]${NC} ${platform} -> ${pack_name}.zip"
|
||||||
(cd "$BUILD_DIR" && zip -q "${pack_file}" "$(basename $binary)")
|
(cd "$TEMP_DIR" && zip -q -r "${pack_file}" "$(basename $pack_dir)")
|
||||||
else
|
else
|
||||||
pack_file="${TEMP_DIR}/${pack_name}.tar.gz"
|
pack_file="${TEMP_DIR}/${pack_name}.tar.gz"
|
||||||
echo -e "${BLUE}[打包]${NC} ${platform} -> ${pack_name}.tar.gz"
|
echo -e "${BLUE}[打包]${NC} ${platform} -> ${pack_name}.tar.gz"
|
||||||
tar -czf "$pack_file" -C "$BUILD_DIR" "$(basename $binary)"
|
tar -czf "$pack_file" -C "$TEMP_DIR" "$(basename $pack_dir)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 清理临时目录
|
||||||
|
rm -rf "$pack_dir"
|
||||||
|
|
||||||
echo "$pack_file"
|
echo "$pack_file"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|||||||
18
config.yaml.example
Normal file
18
config.yaml.example
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
server:
|
||||||
|
port: 2200
|
||||||
|
backend:
|
||||||
|
url: http://your-backend-server:8080
|
||||||
|
heartbeat:
|
||||||
|
interval: 60
|
||||||
|
log:
|
||||||
|
file: node.log
|
||||||
|
level: info
|
||||||
|
debug: false
|
||||||
|
node:
|
||||||
|
id: 0
|
||||||
|
ip: ""
|
||||||
|
country: ""
|
||||||
|
province: ""
|
||||||
|
city: ""
|
||||||
|
isp: ""
|
||||||
|
|
||||||
437
install.sh
437
install.sh
@@ -8,6 +8,30 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
# 错误处理函数
|
||||||
|
error_handler() {
|
||||||
|
local line_number=$1
|
||||||
|
local command=$2
|
||||||
|
echo ""
|
||||||
|
echo -e "${RED}========================================${NC}"
|
||||||
|
echo -e "${RED} 脚本执行出错!${NC}"
|
||||||
|
echo -e "${RED}========================================${NC}"
|
||||||
|
echo -e "${YELLOW}错误位置: 第 ${line_number} 行${NC}"
|
||||||
|
echo -e "${YELLOW}失败命令: ${command}${NC}"
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}故障排查建议:${NC}"
|
||||||
|
echo " 1. 检查网络连接是否正常"
|
||||||
|
echo " 2. 检查后端地址是否正确: ${BACKEND_URL:-未设置}"
|
||||||
|
echo " 3. 检查是否有足够的磁盘空间和权限"
|
||||||
|
echo " 4. 查看上面的详细错误信息"
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}查看服务日志: sudo journalctl -u ${SERVICE_NAME:-linkmaster-node} -n 50${NC}"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# 设置错误陷阱
|
||||||
|
trap 'error_handler ${LINENO} "${BASH_COMMAND}"' ERR
|
||||||
|
|
||||||
# 颜色输出
|
# 颜色输出
|
||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
GREEN='\033[0;32m'
|
GREEN='\033[0;32m'
|
||||||
@@ -96,7 +120,6 @@ detect_fastest_mirror() {
|
|||||||
|
|
||||||
# Ubuntu/Debian 镜像源列表
|
# Ubuntu/Debian 镜像源列表
|
||||||
UBUNTU_MIRRORS=(
|
UBUNTU_MIRRORS=(
|
||||||
"mirrors.tuna.tsinghua.edu.cn"
|
|
||||||
"mirrors.huaweicloud.com"
|
"mirrors.huaweicloud.com"
|
||||||
"mirrors.163.com"
|
"mirrors.163.com"
|
||||||
"archive.ubuntu.com"
|
"archive.ubuntu.com"
|
||||||
@@ -104,7 +127,6 @@ detect_fastest_mirror() {
|
|||||||
|
|
||||||
# CentOS/RHEL 镜像源列表
|
# CentOS/RHEL 镜像源列表
|
||||||
CENTOS_MIRRORS=(
|
CENTOS_MIRRORS=(
|
||||||
"mirrors.tuna.tsinghua.edu.cn"
|
|
||||||
"mirrors.huaweicloud.com"
|
"mirrors.huaweicloud.com"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -388,6 +410,119 @@ install_dependencies() {
|
|||||||
echo -e "${GREEN}✓ 系统依赖安装完成${NC}"
|
echo -e "${GREEN}✓ 系统依赖安装完成${NC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# 配置时间同步
|
||||||
|
sync_time() {
|
||||||
|
echo -e "${BLUE}配置时间同步...${NC}"
|
||||||
|
|
||||||
|
# 1. 设置时区为 Asia/Shanghai
|
||||||
|
echo -e "${BLUE}[1/6] 设置时区为 Asia/Shanghai${NC}"
|
||||||
|
if command -v timedatectl > /dev/null 2>&1; then
|
||||||
|
sudo timedatectl set-timezone Asia/Shanghai 2>/dev/null || {
|
||||||
|
echo -e "${YELLOW}⚠ timedatectl 设置时区失败,尝试其他方法${NC}"
|
||||||
|
# 尝试创建时区链接(适用于较老的系统)
|
||||||
|
if [ -f /usr/share/zoneinfo/Asia/Shanghai ]; then
|
||||||
|
sudo ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
elif [ -f /usr/share/zoneinfo/Asia/Shanghai ]; then
|
||||||
|
sudo ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2. 安装 chrony
|
||||||
|
echo -e "${BLUE}[2/6] 安装 chrony${NC}"
|
||||||
|
if [ "$OS" = "ubuntu" ] || [ "$OS" = "debian" ]; then
|
||||||
|
if ! dpkg -l 2>/dev/null | grep -q "^ii.*chrony"; then
|
||||||
|
sudo apt-get install -y chrony
|
||||||
|
else
|
||||||
|
echo -e "${BLUE}chrony 已安装,跳过${NC}"
|
||||||
|
fi
|
||||||
|
elif [ "$OS" = "centos" ] || [ "$OS" = "rhel" ] || [ "$OS" = "rocky" ] || [ "$OS" = "almalinux" ]; then
|
||||||
|
if ! rpm -q chrony &>/dev/null; then
|
||||||
|
sudo yum install -y chrony
|
||||||
|
else
|
||||||
|
echo -e "${BLUE}chrony 已安装,跳过${NC}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -e "${YELLOW}⚠ 未知系统类型,跳过 chrony 安装${NC}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 3. 配置 NTP 服务器
|
||||||
|
echo -e "${BLUE}[3/6] 配置 NTP 服务器${NC}"
|
||||||
|
CONF="/etc/chrony.conf"
|
||||||
|
|
||||||
|
if [ -f "$CONF" ]; then
|
||||||
|
# 备份配置文件
|
||||||
|
if [ ! -f "${CONF}.backup.$(date +%Y%m%d)" ]; then
|
||||||
|
sudo cp "$CONF" "${CONF}.backup.$(date +%Y%m%d)" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 注释掉原有的 server 行
|
||||||
|
sudo sed -i 's/^server /#server /g' "$CONF" 2>/dev/null || true
|
||||||
|
|
||||||
|
# 添加中国 NTP 服务器(如果还没有)
|
||||||
|
if ! grep -q "ntp.aliyun.com" "$CONF"; then
|
||||||
|
sudo tee -a "$CONF" > /dev/null <<EOF
|
||||||
|
|
||||||
|
# China NTP servers (added by LinkMaster Node installer)
|
||||||
|
server ntp.aliyun.com iburst
|
||||||
|
server ntp.tencent.com iburst
|
||||||
|
server ntp1.aliyun.com iburst
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -e "${YELLOW}⚠ chrony.conf 不存在,跳过配置${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4. 启动并启用 chronyd
|
||||||
|
echo -e "${BLUE}[4/6] 启动 chronyd${NC}"
|
||||||
|
if command -v systemctl > /dev/null 2>&1; then
|
||||||
|
sudo systemctl enable chronyd --now 2>/dev/null || {
|
||||||
|
# 如果 systemctl 失败,尝试使用 service 命令
|
||||||
|
if command -v service > /dev/null 2>&1; then
|
||||||
|
sudo service chronyd start 2>/dev/null || true
|
||||||
|
sudo chkconfig chronyd on 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
elif command -v service > /dev/null 2>&1; then
|
||||||
|
sudo service chronyd start 2>/dev/null || true
|
||||||
|
sudo chkconfig chronyd on 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 等待服务启动
|
||||||
|
sleep 2
|
||||||
|
|
||||||
|
# 5. 立即强制同步
|
||||||
|
echo -e "${BLUE}[5/6] 强制同步系统时间${NC}"
|
||||||
|
if command -v chronyc > /dev/null 2>&1; then
|
||||||
|
sudo chronyc -a makestep 2>/dev/null || {
|
||||||
|
# 如果 makestep 失败,尝试使用 sources 和 sourcestats
|
||||||
|
sudo chronyc sources 2>/dev/null || true
|
||||||
|
sudo chronyc sourcestats 2>/dev/null || true
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 6. 写入硬件时间
|
||||||
|
echo -e "${BLUE}[6/6] 写入硬件时钟${NC}"
|
||||||
|
if command -v hwclock > /dev/null 2>&1; then
|
||||||
|
sudo hwclock --systohc 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 显示时间状态
|
||||||
|
echo -e "${BLUE}当前时间状态:${NC}"
|
||||||
|
if command -v timedatectl > /dev/null 2>&1; then
|
||||||
|
sudo timedatectl status 2>/dev/null || true
|
||||||
|
else
|
||||||
|
date
|
||||||
|
if command -v hwclock > /dev/null 2>&1; then
|
||||||
|
echo -e "${BLUE}硬件时钟:${NC}"
|
||||||
|
sudo hwclock 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${GREEN}✓ 时间同步配置完成${NC}"
|
||||||
|
}
|
||||||
|
|
||||||
# 从官网下载安装 Go
|
# 从官网下载安装 Go
|
||||||
install_go_from_official() {
|
install_go_from_official() {
|
||||||
echo -e "${BLUE}从 Go 官网下载安装...${NC}"
|
echo -e "${BLUE}从 Go 官网下载安装...${NC}"
|
||||||
@@ -811,21 +946,20 @@ download_binary_from_releases() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# 解压文件
|
# 解压文件
|
||||||
echo -e "${BLUE}解压二进制文件...${NC}"
|
echo -e "${BLUE}解压发布包...${NC}"
|
||||||
cd "$temp_dir"
|
cd "$temp_dir"
|
||||||
|
|
||||||
|
local extracted_dir=""
|
||||||
if [ "$file_ext" = "tar.gz" ]; then
|
if [ "$file_ext" = "tar.gz" ]; then
|
||||||
if ! tar -xzf "$download_file" 2>/dev/null; then
|
if ! tar -xzf "$download_file" 2>/dev/null; then
|
||||||
echo -e "${YELLOW}⚠ 解压失败,将使用源码编译${NC}"
|
echo -e "${YELLOW}⚠ 解压失败,将使用源码编译${NC}"
|
||||||
rm -rf "$temp_dir"
|
rm -rf "$temp_dir"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
# 查找解压后的二进制文件(优先查找 agent,然后是 agent-*)
|
# 查找解压后的目录(可能是直接解压到当前目录,也可能是在子目录中)
|
||||||
local binary_file=""
|
extracted_dir=$(find . -maxdepth 1 -type d ! -name "." ! -name ".." | head -1)
|
||||||
if [ -f "./agent" ] && [ -x "./agent" ]; then
|
if [ -z "$extracted_dir" ]; then
|
||||||
binary_file="./agent"
|
extracted_dir="."
|
||||||
else
|
|
||||||
binary_file=$(find . -maxdepth 1 -type f \( -name "agent" -o -name "agent-*" -o -name "Agent" -o -name "Agent-*" \) ! -name "*.tar.gz" ! -name "*.zip" 2>/dev/null | head -1)
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Windows zip 文件(虽然脚本主要在 Linux 上运行,但保留兼容性)
|
# Windows zip 文件(虽然脚本主要在 Linux 上运行,但保留兼容性)
|
||||||
@@ -834,26 +968,82 @@ download_binary_from_releases() {
|
|||||||
rm -rf "$temp_dir"
|
rm -rf "$temp_dir"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
local binary_file=$(find . -maxdepth 1 -type f \( -name "agent*.exe" -o -name "Agent*.exe" \) 2>/dev/null | head -1)
|
extracted_dir=$(find . -maxdepth 1 -type d ! -name "." ! -name ".." | head -1)
|
||||||
|
if [ -z "$extracted_dir" ]; then
|
||||||
|
extracted_dir="."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd "$extracted_dir" || {
|
||||||
|
echo -e "${YELLOW}⚠ 无法进入解压目录,将使用源码编译${NC}"
|
||||||
|
rm -rf "$temp_dir"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# 显示解压后的目录内容(用于调试)
|
||||||
|
echo -e "${BLUE}解压目录内容:${NC}"
|
||||||
|
ls -la . 2>/dev/null || true
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 查找二进制文件(先检查当前目录,再递归查找)
|
||||||
|
local binary_file=""
|
||||||
|
if [ "$OS_TYPE" = "windows" ]; then
|
||||||
|
if [ -f "./agent.exe" ]; then
|
||||||
|
binary_file="./agent.exe"
|
||||||
|
elif [ -f "agent.exe" ]; then
|
||||||
|
binary_file="agent.exe"
|
||||||
|
else
|
||||||
|
# 递归查找所有 .exe 文件
|
||||||
|
binary_file=$(find . -type f -name "*.exe" ! -name "*.tar.gz" ! -name "*.zip" 2>/dev/null | grep -i agent | head -1)
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Linux/macOS: 先检查常见位置
|
||||||
|
if [ -f "./agent" ]; then
|
||||||
|
binary_file="./agent"
|
||||||
|
elif [ -f "agent" ]; then
|
||||||
|
binary_file="agent"
|
||||||
|
else
|
||||||
|
# 递归查找所有文件,排除压缩包和目录
|
||||||
|
# 查找名为 agent 的文件(不是目录)
|
||||||
|
binary_file=$(find . -type f \( -name "agent" -o -name "agent-*" \) ! -name "*.tar.gz" ! -name "*.zip" 2>/dev/null | head -1)
|
||||||
|
|
||||||
|
# 如果还是找不到,尝试查找所有可执行文件
|
||||||
|
if [ -z "$binary_file" ]; then
|
||||||
|
binary_file=$(find . -type f -perm +111 ! -name "*.tar.gz" ! -name "*.zip" ! -name "*.sh" 2>/dev/null | head -1)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$binary_file" ] || [ ! -f "$binary_file" ]; then
|
if [ -z "$binary_file" ] || [ ! -f "$binary_file" ]; then
|
||||||
echo -e "${YELLOW}⚠ 未找到解压后的二进制文件,将使用源码编译${NC}"
|
echo -e "${YELLOW}⚠ 未找到解压后的二进制文件,将使用源码编译${NC}"
|
||||||
echo -e "${YELLOW} 解压目录内容:${NC}"
|
echo -e "${YELLOW} 当前目录: $(pwd)${NC}"
|
||||||
ls -la "$temp_dir" 2>/dev/null || true
|
echo -e "${YELLOW} 查找的文件: agent 或 agent-*${NC}"
|
||||||
|
echo -e "${YELLOW} 所有文件列表:${NC}"
|
||||||
|
find . -type f 2>/dev/null | head -20 || true
|
||||||
rm -rf "$temp_dir"
|
rm -rf "$temp_dir"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 确保使用绝对路径
|
||||||
|
local binary_path=""
|
||||||
|
if [[ "$binary_file" == /* ]]; then
|
||||||
|
binary_path="$binary_file"
|
||||||
|
else
|
||||||
|
# 转换为绝对路径
|
||||||
|
binary_path="$(cd "$(dirname "$binary_file")" && pwd)/$(basename "$binary_file")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${GREEN}✓ 找到二进制文件: ${binary_path}${NC}"
|
||||||
|
|
||||||
# 验证二进制文件是否可执行
|
# 验证二进制文件是否可执行
|
||||||
if [ ! -x "$binary_file" ]; then
|
if [ ! -x "$binary_path" ]; then
|
||||||
chmod +x "$binary_file" 2>/dev/null || true
|
chmod +x "$binary_path" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 验证二进制文件类型(Linux 应该是 ELF 文件)
|
# 验证二进制文件类型(Linux 应该是 ELF 文件)
|
||||||
if [ "$OS_TYPE" = "linux" ]; then
|
if [ "$OS_TYPE" = "linux" ]; then
|
||||||
if command -v file > /dev/null 2>&1; then
|
if command -v file > /dev/null 2>&1; then
|
||||||
local file_type=$(file "$binary_file" 2>/dev/null || echo "")
|
local file_type=$(file "$binary_path" 2>/dev/null || echo "")
|
||||||
if [ -n "$file_type" ] && ! echo "$file_type" | grep -qi "ELF"; then
|
if [ -n "$file_type" ] && ! echo "$file_type" | grep -qi "ELF"; then
|
||||||
echo -e "${YELLOW}⚠ 二进制文件类型异常: ${file_type}${NC}"
|
echo -e "${YELLOW}⚠ 二进制文件类型异常: ${file_type}${NC}"
|
||||||
echo -e "${YELLOW} 将使用源码编译${NC}"
|
echo -e "${YELLOW} 将使用源码编译${NC}"
|
||||||
@@ -863,93 +1053,98 @@ download_binary_from_releases() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 保存下载的二进制文件到临时位置
|
# 保存当前目录(extracted_dir)
|
||||||
local downloaded_binary="${temp_dir}/downloaded_agent"
|
local extracted_path="$(pwd)"
|
||||||
sudo cp "$binary_file" "$downloaded_binary"
|
|
||||||
sudo chmod +x "$downloaded_binary"
|
|
||||||
|
|
||||||
# 验证复制后的文件
|
# 检查是否是新格式的发布包(包含脚本文件)
|
||||||
if [ ! -f "$downloaded_binary" ] || [ ! -x "$downloaded_binary" ]; then
|
local has_scripts=false
|
||||||
echo -e "${YELLOW}⚠ 二进制文件验证失败,将使用源码编译${NC}"
|
if [ -f "$extracted_path/install.sh" ] || [ -f "$extracted_path/run.sh" ] || [ -f "$extracted_path/start-systemd.sh" ]; then
|
||||||
rm -rf "$temp_dir"
|
has_scripts=true
|
||||||
return 1
|
echo -e "${GREEN}✓ 检测到新格式发布包(包含脚本文件)${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 清理临时下载文件
|
# 创建源码目录
|
||||||
rm -f "$download_file"
|
|
||||||
|
|
||||||
# 克隆仓库(用于获取 run.sh 和 start-systemd.sh 等脚本)
|
|
||||||
echo -e "${BLUE}克隆仓库以获取启动脚本...${NC}"
|
|
||||||
if [ -d "$SOURCE_DIR" ]; then
|
if [ -d "$SOURCE_DIR" ]; then
|
||||||
sudo rm -rf "$SOURCE_DIR"
|
sudo rm -rf "$SOURCE_DIR"
|
||||||
fi
|
fi
|
||||||
|
sudo mkdir -p "$SOURCE_DIR"
|
||||||
|
|
||||||
if ! sudo git clone --branch "${GITHUB_BRANCH}" "https://gitee.nas.cpolar.cn/${GITHUB_REPO}.git" "$SOURCE_DIR" 2>&1; then
|
if [ "$has_scripts" = true ]; then
|
||||||
echo -e "${YELLOW}⚠ 克隆仓库失败,将使用源码编译${NC}"
|
# 新格式:从压缩包提取所有文件
|
||||||
rm -rf "$temp_dir"
|
echo -e "${BLUE}从发布包提取所有文件...${NC}"
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 对比 Git commit hash
|
|
||||||
if [ -n "$release_commit" ]; then
|
|
||||||
echo -e "${BLUE}验证 Git commit 版本...${NC}"
|
|
||||||
|
|
||||||
# 切换到源码目录(如果存在)
|
# 复制二进制文件
|
||||||
if [ -d "$SOURCE_DIR" ] && [ -d "$SOURCE_DIR/.git" ]; then
|
sudo cp "$binary_path" "$SOURCE_DIR/agent"
|
||||||
cd "$SOURCE_DIR" || {
|
sudo chmod +x "$SOURCE_DIR/agent"
|
||||||
echo -e "${YELLOW}⚠ 无法切换到源码目录,跳过验证${NC}"
|
echo -e "${GREEN}✓ 已提取二进制文件${NC}"
|
||||||
cd /tmp || true
|
|
||||||
}
|
# 复制脚本文件
|
||||||
|
local scripts=("install.sh" "run.sh" "start-systemd.sh" "uninstall.sh")
|
||||||
|
for script in "${scripts[@]}"; do
|
||||||
|
if [ -f "$extracted_path/$script" ]; then
|
||||||
|
sudo cp "$extracted_path/$script" "$SOURCE_DIR/"
|
||||||
|
sudo chmod +x "$SOURCE_DIR/$script"
|
||||||
|
echo -e "${GREEN}✓ 已提取 $script${NC}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# 复制示例配置文件
|
||||||
|
if [ -f "$extracted_path/config.yaml.example" ]; then
|
||||||
|
sudo cp "$extracted_path/config.yaml.example" "$SOURCE_DIR/config.yaml.example"
|
||||||
|
echo -e "${GREEN}✓ 已提取 config.yaml.example${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${GREEN}✓ 所有文件已从发布包提取,无需克隆 Git 仓库${NC}"
|
||||||
|
else
|
||||||
|
# 旧格式:只有二进制文件,需要克隆 Git 仓库获取脚本
|
||||||
|
echo -e "${BLUE}检测到旧格式发布包(仅包含二进制文件)${NC}"
|
||||||
|
echo -e "${BLUE}克隆仓库以获取启动脚本...${NC}"
|
||||||
|
|
||||||
|
if ! sudo git clone --branch "${GITHUB_BRANCH}" "https://gitee.nas.cpolar.cn/${GITHUB_REPO}.git" "$SOURCE_DIR" 2>&1; then
|
||||||
|
echo -e "${YELLOW}⚠ 克隆仓库失败,将使用源码编译${NC}"
|
||||||
|
rm -rf "$temp_dir"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 对比 Git commit hash(仅旧格式需要)
|
||||||
|
if [ -n "$release_commit" ]; then
|
||||||
|
echo -e "${BLUE}验证 Git commit 版本...${NC}"
|
||||||
|
|
||||||
# 获取当前分支的最新 commit hash
|
if [ -d "$SOURCE_DIR/.git" ]; then
|
||||||
local current_commit=$(git rev-parse HEAD 2>/dev/null || echo "")
|
cd "$SOURCE_DIR" || {
|
||||||
|
echo -e "${YELLOW}⚠ 无法切换到源码目录,跳过验证${NC}"
|
||||||
if [ -n "$current_commit" ]; then
|
cd /tmp || true
|
||||||
# 截取短 commit hash 用于显示(前7位)
|
}
|
||||||
local release_commit_short=""
|
|
||||||
local current_commit_short=$(echo "$current_commit" | cut -c1-7)
|
|
||||||
|
|
||||||
if [ "${#release_commit}" -eq 40 ]; then
|
local current_commit=$(git rev-parse HEAD 2>/dev/null || echo "")
|
||||||
release_commit_short=$(echo "$release_commit" | cut -c1-7)
|
|
||||||
else
|
|
||||||
release_commit_short="$release_commit"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "${BLUE} Release commit: ${release_commit_short}${NC}"
|
if [ -n "$current_commit" ] && [ "${#release_commit}" -eq 40 ] && [ "${#current_commit}" -eq 40 ]; then
|
||||||
echo -e "${BLUE} 当前代码 commit: ${current_commit_short}${NC}"
|
local release_commit_short=$(echo "$release_commit" | cut -c1-7)
|
||||||
|
local current_commit_short=$(echo "$current_commit" | cut -c1-7)
|
||||||
# 对比 commit hash(只有当 release_commit 是完整的 commit hash 时才对比)
|
|
||||||
if [ "${#release_commit}" -eq 40 ] && [ "${#current_commit}" -eq 40 ]; then
|
echo -e "${BLUE} Release commit: ${release_commit_short}${NC}"
|
||||||
|
echo -e "${BLUE} 当前代码 commit: ${current_commit_short}${NC}"
|
||||||
|
|
||||||
if [ "$release_commit" != "$current_commit" ]; then
|
if [ "$release_commit" != "$current_commit" ]; then
|
||||||
echo -e "${YELLOW}⚠ Commit hash 不匹配,二进制文件可能不是最新代码编译的${NC}"
|
echo -e "${YELLOW}⚠ Commit hash 不匹配,二进制文件可能不是最新代码编译的${NC}"
|
||||||
echo -e "${YELLOW} Release 基于较旧的代码,将使用源码编译最新版本${NC}"
|
echo -e "${YELLOW} Release 基于较旧的代码,将使用源码编译最新版本${NC}"
|
||||||
# 保留已克隆的仓库目录,供 build_from_source 复用
|
|
||||||
cd /tmp || true
|
cd /tmp || true
|
||||||
rm -rf "$temp_dir"
|
rm -rf "$temp_dir"
|
||||||
return 1
|
return 1
|
||||||
else
|
else
|
||||||
echo -e "${GREEN}✓ Commit hash 匹配,二进制文件是最新代码编译的${NC}"
|
echo -e "${GREEN}✓ Commit hash 匹配${NC}"
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo -e "${YELLOW}⚠ 无法获取有效的 commit hash 进行对比,跳过验证${NC}"
|
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo -e "${YELLOW}⚠ 无法获取当前代码的 commit hash,跳过验证${NC}"
|
cd /tmp || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 返回临时目录
|
|
||||||
cd /tmp || true
|
|
||||||
else
|
|
||||||
echo -e "${YELLOW}⚠ 源码目录不存在,跳过验证${NC}"
|
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo -e "${YELLOW}⚠ 无法获取 release 的 commit hash,跳过验证${NC}"
|
# 用下载的二进制文件覆盖克隆目录中的文件
|
||||||
|
sudo cp "$binary_path" "$SOURCE_DIR/agent"
|
||||||
|
sudo chmod +x "$SOURCE_DIR/agent"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 用下载的二进制文件覆盖克隆目录中的文件
|
|
||||||
sudo cp "$downloaded_binary" "$SOURCE_DIR/agent"
|
|
||||||
sudo chmod +x "$SOURCE_DIR/agent"
|
|
||||||
|
|
||||||
# 复制到安装目录
|
# 复制到安装目录
|
||||||
sudo mkdir -p "$INSTALL_DIR"
|
sudo mkdir -p "$INSTALL_DIR"
|
||||||
sudo cp "$SOURCE_DIR/agent" "$INSTALL_DIR/$BINARY_NAME"
|
sudo cp "$SOURCE_DIR/agent" "$INSTALL_DIR/$BINARY_NAME"
|
||||||
@@ -960,9 +1155,9 @@ download_binary_from_releases() {
|
|||||||
|
|
||||||
# 显示文件信息
|
# 显示文件信息
|
||||||
local binary_size=$(du -h "$SOURCE_DIR/agent" | cut -f1)
|
local binary_size=$(du -h "$SOURCE_DIR/agent" | cut -f1)
|
||||||
echo -e "${GREEN}✓ 二进制文件下载完成 (文件大小: ${binary_size})${NC}"
|
echo -e "${GREEN}✓ 安装文件准备完成 (文件大小: ${binary_size})${NC}"
|
||||||
echo -e "${BLUE}版本: ${latest_tag}${NC}"
|
echo -e "${BLUE}版本: ${latest_tag}${NC}"
|
||||||
echo -e "${BLUE}二进制文件: ${SOURCE_DIR}/agent${NC}"
|
echo -e "${BLUE}安装目录: ${SOURCE_DIR}${NC}"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
@@ -1264,11 +1459,18 @@ EOF
|
|||||||
|
|
||||||
# 调用心跳API获取节点信息
|
# 调用心跳API获取节点信息
|
||||||
echo -e "${BLUE}发送心跳请求获取节点信息...${NC}"
|
echo -e "${BLUE}发送心跳请求获取节点信息...${NC}"
|
||||||
RESPONSE=$(curl -s -X POST "${BACKEND_URL}/api/node/heartbeat" \
|
echo -e "${BLUE}后端地址: ${BACKEND_URL}${NC}"
|
||||||
|
|
||||||
|
# 添加超时设置,避免长时间卡住
|
||||||
|
# 使用 set +e 临时禁用错误退出,因为心跳失败不应该阻止安装
|
||||||
|
set +e
|
||||||
|
RESPONSE=$(curl -s --connect-timeout 10 --max-time 30 -X POST "${BACKEND_URL}/api/node/heartbeat" \
|
||||||
-H "Content-Type: application/x-www-form-urlencoded" \
|
-H "Content-Type: application/x-www-form-urlencoded" \
|
||||||
-d "type=pingServer" 2>&1)
|
-d "type=pingServer" 2>&1)
|
||||||
|
CURL_EXIT_CODE=$?
|
||||||
|
set -e # 重新启用错误退出
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ $CURL_EXIT_CODE -eq 0 ]; then
|
||||||
# 尝试解析JSON响应
|
# 尝试解析JSON响应
|
||||||
NODE_ID=$(echo "$RESPONSE" | grep -o '"node_id":[0-9]*' | grep -o '[0-9]*' | head -1)
|
NODE_ID=$(echo "$RESPONSE" | grep -o '"node_id":[0-9]*' | grep -o '[0-9]*' | head -1)
|
||||||
NODE_IP=$(echo "$RESPONSE" | grep -o '"node_ip":"[^"]*"' | cut -d'"' -f4 | head -1)
|
NODE_IP=$(echo "$RESPONSE" | grep -o '"node_ip":"[^"]*"' | cut -d'"' -f4 | head -1)
|
||||||
@@ -1306,8 +1508,10 @@ EOF
|
|||||||
echo -e "${YELLOW} 响应: ${RESPONSE}${NC}"
|
echo -e "${YELLOW} 响应: ${RESPONSE}${NC}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo -e "${YELLOW}⚠ 心跳请求失败,将在服务启动时重试${NC}"
|
echo -e "${YELLOW}⚠ 心跳请求失败 (退出码: ${CURL_EXIT_CODE}),将在服务启动时重试${NC}"
|
||||||
echo -e "${YELLOW} 错误: ${RESPONSE}${NC}"
|
echo -e "${YELLOW} 错误信息: ${RESPONSE}${NC}"
|
||||||
|
echo -e "${YELLOW} 提示: 请检查后端地址是否正确: ${BACKEND_URL}${NC}"
|
||||||
|
echo -e "${YELLOW} 测试连接: curl -v ${BACKEND_URL}/api/public/nodes/online${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 设置配置文件权限
|
# 设置配置文件权限
|
||||||
@@ -1318,18 +1522,52 @@ EOF
|
|||||||
start_service() {
|
start_service() {
|
||||||
echo -e "${BLUE}启动服务...${NC}"
|
echo -e "${BLUE}启动服务...${NC}"
|
||||||
|
|
||||||
sudo systemctl enable ${SERVICE_NAME} > /dev/null 2>&1
|
# 先检查服务文件是否存在
|
||||||
sudo systemctl restart ${SERVICE_NAME}
|
if [ ! -f "/etc/systemd/system/${SERVICE_NAME}.service" ]; then
|
||||||
|
echo -e "${RED}✗ 错误: 服务文件不存在${NC}"
|
||||||
|
echo -e "${YELLOW} 路径: /etc/systemd/system/${SERVICE_NAME}.service${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 检查二进制文件是否存在
|
||||||
|
if [ ! -f "$SOURCE_DIR/agent" ] && [ ! -f "$INSTALL_DIR/$BINARY_NAME" ]; then
|
||||||
|
echo -e "${RED}✗ 错误: 二进制文件不存在${NC}"
|
||||||
|
echo -e "${YELLOW} 检查路径: $SOURCE_DIR/agent 或 $INSTALL_DIR/$BINARY_NAME${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 启用服务(显示输出以便调试)
|
||||||
|
echo -e "${BLUE}启用服务...${NC}"
|
||||||
|
if ! sudo systemctl enable ${SERVICE_NAME} 2>&1; then
|
||||||
|
echo -e "${RED}✗ 启用服务失败${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 重新加载 systemd
|
||||||
|
echo -e "${BLUE}重新加载 systemd...${NC}"
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
|
||||||
|
# 启动服务(显示输出以便调试)
|
||||||
|
echo -e "${BLUE}启动服务...${NC}"
|
||||||
|
if ! sudo systemctl restart ${SERVICE_NAME} 2>&1; then
|
||||||
|
echo -e "${RED}✗ 启动服务失败${NC}"
|
||||||
|
echo -e "${YELLOW}查看详细日志: sudo journalctl -u ${SERVICE_NAME} -n 100 --no-pager${NC}"
|
||||||
|
echo -e "${YELLOW}查看服务状态: sudo systemctl status ${SERVICE_NAME}${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# 等待服务启动
|
# 等待服务启动
|
||||||
|
echo -e "${BLUE}等待服务启动...${NC}"
|
||||||
sleep 3
|
sleep 3
|
||||||
|
|
||||||
# 检查服务状态
|
# 检查服务状态
|
||||||
if sudo systemctl is-active --quiet ${SERVICE_NAME}; then
|
if sudo systemctl is-active --quiet ${SERVICE_NAME} 2>/dev/null; then
|
||||||
echo -e "${GREEN}✓ 服务启动成功${NC}"
|
echo -e "${GREEN}✓ 服务启动成功${NC}"
|
||||||
else
|
else
|
||||||
echo -e "${RED}✗ 服务启动失败${NC}"
|
echo -e "${RED}✗ 服务启动失败${NC}"
|
||||||
echo -e "${YELLOW}查看日志: sudo journalctl -u ${SERVICE_NAME} -n 50${NC}"
|
echo -e "${YELLOW}服务状态:${NC}"
|
||||||
|
sudo systemctl status ${SERVICE_NAME} --no-pager -l || true
|
||||||
|
echo -e "${YELLOW}查看详细日志: sudo journalctl -u ${SERVICE_NAME} -n 100 --no-pager${NC}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -1387,20 +1625,32 @@ main() {
|
|||||||
echo -e "${GREEN} LinkMaster 节点端安装程序${NC}"
|
echo -e "${GREEN} LinkMaster 节点端安装程序${NC}"
|
||||||
echo -e "${GREEN}========================================${NC}"
|
echo -e "${GREEN}========================================${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
|
echo -e "${BLUE}后端地址: ${BACKEND_URL}${NC}"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
echo -e "${BLUE}[1/11] 检测系统类型...${NC}"
|
||||||
detect_system
|
detect_system
|
||||||
|
|
||||||
# 检查是否已安装,如果已安装则先卸载
|
# 检查是否已安装,如果已安装则先卸载
|
||||||
if check_installed; then
|
if check_installed; then
|
||||||
|
echo -e "${BLUE}[2/11] 卸载已存在的服务...${NC}"
|
||||||
uninstall_service
|
uninstall_service
|
||||||
|
else
|
||||||
|
echo -e "${BLUE}[2/11] 检查已安装服务...${NC}"
|
||||||
|
echo -e "${GREEN}✓ 未检测到已安装的服务${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 检测并配置最快的镜像源(在安装依赖之前)
|
echo -e "${BLUE}[3/11] 检测并配置镜像源...${NC}"
|
||||||
detect_fastest_mirror
|
detect_fastest_mirror
|
||||||
|
|
||||||
|
echo -e "${BLUE}[4/11] 安装系统依赖...${NC}"
|
||||||
install_dependencies
|
install_dependencies
|
||||||
|
|
||||||
|
echo -e "${BLUE}[5/11] 配置时间同步...${NC}"
|
||||||
|
sync_time
|
||||||
|
|
||||||
# 优先尝试从 Releases 下载二进制文件
|
# 优先尝试从 Releases 下载二进制文件
|
||||||
|
echo -e "${BLUE}[6/11] 下载或编译二进制文件...${NC}"
|
||||||
if ! download_binary_from_releases; then
|
if ! download_binary_from_releases; then
|
||||||
echo -e "${BLUE}从 Releases 下载失败,开始从源码编译...${NC}"
|
echo -e "${BLUE}从 Releases 下载失败,开始从源码编译...${NC}"
|
||||||
build_from_source
|
build_from_source
|
||||||
@@ -1408,10 +1658,19 @@ main() {
|
|||||||
echo -e "${GREEN}✓ 使用预编译二进制文件,跳过编译步骤${NC}"
|
echo -e "${GREEN}✓ 使用预编译二进制文件,跳过编译步骤${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo -e "${BLUE}[7/11] 创建 systemd 服务...${NC}"
|
||||||
create_service
|
create_service
|
||||||
|
|
||||||
|
echo -e "${BLUE}[8/11] 配置防火墙规则...${NC}"
|
||||||
configure_firewall
|
configure_firewall
|
||||||
|
|
||||||
|
echo -e "${BLUE}[9/11] 登记节点到后端服务器...${NC}"
|
||||||
register_node
|
register_node
|
||||||
|
|
||||||
|
echo -e "${BLUE}[10/11] 启动服务...${NC}"
|
||||||
start_service
|
start_service
|
||||||
|
|
||||||
|
echo -e "${BLUE}[11/11] 验证安装...${NC}"
|
||||||
verify_installation
|
verify_installation
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
@@ -72,6 +72,12 @@ func Load() (*Config, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 环境变量优先级最高,覆盖配置文件中的设置
|
||||||
|
// 支持 BACKEND_URL 环境变量覆盖后端地址
|
||||||
|
if backendURL := os.Getenv("BACKEND_URL"); backendURL != "" {
|
||||||
|
cfg.Backend.URL = backendURL
|
||||||
|
}
|
||||||
|
|
||||||
// 如果配置文件中没有设置日志文件,使用环境变量或默认值
|
// 如果配置文件中没有设置日志文件,使用环境变量或默认值
|
||||||
if cfg.Log.File == "" {
|
if cfg.Log.File == "" {
|
||||||
logFile := os.Getenv("LOG_FILE")
|
logFile := os.Getenv("LOG_FILE")
|
||||||
|
|||||||
@@ -28,14 +28,47 @@ type TCPingTask struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewTCPingTask(taskID, target string, interval, maxDuration time.Duration) (*TCPingTask, error) {
|
func NewTCPingTask(taskID, target string, interval, maxDuration time.Duration) (*TCPingTask, error) {
|
||||||
// 解析host:port
|
// 解析host:port,如果没有端口则默认80
|
||||||
parts := strings.Split(target, ":")
|
var host string
|
||||||
if len(parts) != 2 {
|
var portStr string
|
||||||
return nil, fmt.Errorf("无效的target格式,需要 host:port")
|
var port int
|
||||||
|
|
||||||
|
// 检查是否是IPv6格式(如 [::1]:8080)
|
||||||
|
if strings.HasPrefix(target, "[") {
|
||||||
|
// IPv6格式 - 使用 Index 而不是 LastIndex 来找到第一个闭合括号
|
||||||
|
closeBracket := strings.Index(target, "]")
|
||||||
|
if closeBracket == -1 {
|
||||||
|
return nil, fmt.Errorf("无效的target格式,IPv6地址格式应为 [host]:port")
|
||||||
|
}
|
||||||
|
host = target[1:closeBracket]
|
||||||
|
if closeBracket+1 < len(target) && target[closeBracket+1] == ':' {
|
||||||
|
portStr = target[closeBracket+2:]
|
||||||
|
// 如果端口部分为空,使用默认端口80(修复 Bug 1)
|
||||||
|
if portStr == "" {
|
||||||
|
portStr = "80"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
portStr = "80" // 默认端口
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 普通格式 host:port 或 host
|
||||||
|
lastColonIndex := strings.LastIndex(target, ":")
|
||||||
|
if lastColonIndex == -1 {
|
||||||
|
// 没有冒号,使用默认端口80
|
||||||
|
host = target
|
||||||
|
portStr = "80"
|
||||||
|
} else {
|
||||||
|
host = target[:lastColonIndex]
|
||||||
|
portStr = target[lastColonIndex+1:]
|
||||||
|
// 如果端口部分为空,使用默认端口80
|
||||||
|
if portStr == "" {
|
||||||
|
portStr = "80"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
host := parts[0]
|
var err error
|
||||||
port, err := strconv.Atoi(parts[1])
|
port, err = strconv.Atoi(portStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("无效的端口: %v", err)
|
return nil, fmt.Errorf("无效的端口: %v", err)
|
||||||
}
|
}
|
||||||
@@ -80,10 +113,10 @@ func (t *TCPingTask) Start(ctx context.Context, resultCallback func(result map[s
|
|||||||
if !isRunning {
|
if !isRunning {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 执行tcping测试(每次测试完成后立即返回结果)
|
// 执行tcping测试(每次测试完成后立即返回结果)
|
||||||
result := t.executeTCPing()
|
result := t.executeTCPing()
|
||||||
|
|
||||||
// 再次检查任务是否已停止(执行完成后)
|
// 再次检查任务是否已停止(执行完成后)
|
||||||
t.mu.RLock()
|
t.mu.RLock()
|
||||||
isRunning = t.IsRunning
|
isRunning = t.IsRunning
|
||||||
@@ -91,7 +124,7 @@ func (t *TCPingTask) Start(ctx context.Context, resultCallback func(result map[s
|
|||||||
if !isRunning {
|
if !isRunning {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if resultCallback != nil {
|
if resultCallback != nil {
|
||||||
resultCallback(result)
|
resultCallback(result)
|
||||||
}
|
}
|
||||||
@@ -117,7 +150,7 @@ func (t *TCPingTask) Stop() {
|
|||||||
}
|
}
|
||||||
t.IsRunning = false
|
t.IsRunning = false
|
||||||
t.mu.Unlock()
|
t.mu.Unlock()
|
||||||
|
|
||||||
// 关闭停止通道
|
// 关闭停止通道
|
||||||
select {
|
select {
|
||||||
case <-t.StopCh:
|
case <-t.StopCh:
|
||||||
@@ -125,7 +158,7 @@ func (t *TCPingTask) Stop() {
|
|||||||
default:
|
default:
|
||||||
close(t.StopCh)
|
close(t.StopCh)
|
||||||
}
|
}
|
||||||
|
|
||||||
t.logger.Info("TCPing任务已停止", zap.String("task_id", t.TaskID))
|
t.logger.Info("TCPing任务已停止", zap.String("task_id", t.TaskID))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,4 +218,3 @@ func (t *TCPingTask) executeTCPing() map[string]interface{} {
|
|||||||
"ip": targetIP,
|
"ip": targetIP,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
@@ -18,6 +19,7 @@ import (
|
|||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
"go.uber.org/zap/zapcore"
|
||||||
)
|
)
|
||||||
|
|
||||||
var continuousTasks = make(map[string]*ContinuousTask)
|
var continuousTasks = make(map[string]*ContinuousTask)
|
||||||
@@ -46,7 +48,52 @@ const (
|
|||||||
|
|
||||||
func InitContinuousHandler(cfg *config.Config) {
|
func InitContinuousHandler(cfg *config.Config) {
|
||||||
backendURL = cfg.Backend.URL
|
backendURL = cfg.Backend.URL
|
||||||
logger, _ = zap.NewProduction()
|
|
||||||
|
// 根据配置创建logger
|
||||||
|
var level zapcore.Level
|
||||||
|
logLevel := cfg.Log.Level
|
||||||
|
if logLevel == "" {
|
||||||
|
if cfg.Debug {
|
||||||
|
logLevel = "debug"
|
||||||
|
} else {
|
||||||
|
logLevel = "info"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch logLevel {
|
||||||
|
case "debug":
|
||||||
|
level = zapcore.DebugLevel
|
||||||
|
case "info":
|
||||||
|
level = zapcore.InfoLevel
|
||||||
|
case "warn":
|
||||||
|
level = zapcore.WarnLevel
|
||||||
|
case "error":
|
||||||
|
level = zapcore.ErrorLevel
|
||||||
|
default:
|
||||||
|
level = zapcore.InfoLevel
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建编码器配置
|
||||||
|
encoderConfig := zap.NewProductionEncoderConfig()
|
||||||
|
if cfg.Debug {
|
||||||
|
encoderConfig = zap.NewDevelopmentEncoderConfig()
|
||||||
|
}
|
||||||
|
encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
|
||||||
|
encoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
|
||||||
|
|
||||||
|
// 创建核心 - 输出到标准错误(日志文件由main.go统一管理,这里输出到stderr便于调试)
|
||||||
|
core := zapcore.NewCore(
|
||||||
|
zapcore.NewJSONEncoder(encoderConfig),
|
||||||
|
zapcore.AddSync(os.Stderr),
|
||||||
|
level,
|
||||||
|
)
|
||||||
|
|
||||||
|
// 创建logger
|
||||||
|
logger = zap.New(core, zap.AddCaller(), zap.AddStacktrace(zapcore.ErrorLevel))
|
||||||
|
|
||||||
|
logger.Info("持续测试处理器已初始化",
|
||||||
|
zap.String("backend_url", backendURL),
|
||||||
|
zap.String("log_level", logLevel))
|
||||||
}
|
}
|
||||||
|
|
||||||
type ContinuousTask struct {
|
type ContinuousTask struct {
|
||||||
@@ -160,7 +207,15 @@ func HandleContinuousStop(c *gin.Context) {
|
|||||||
if task.tcpingTask != nil {
|
if task.tcpingTask != nil {
|
||||||
task.tcpingTask.Stop()
|
task.tcpingTask.Stop()
|
||||||
}
|
}
|
||||||
close(task.StopCh)
|
|
||||||
|
// 关闭停止通道
|
||||||
|
select {
|
||||||
|
case <-task.StopCh:
|
||||||
|
// 已经关闭
|
||||||
|
default:
|
||||||
|
close(task.StopCh)
|
||||||
|
}
|
||||||
|
|
||||||
delete(continuousTasks, req.TaskID)
|
delete(continuousTasks, req.TaskID)
|
||||||
}
|
}
|
||||||
taskMutex.Unlock()
|
taskMutex.Unlock()
|
||||||
@@ -170,6 +225,17 @@ func HandleContinuousStop(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 清理推送缓冲
|
||||||
|
bufferMutex.Lock()
|
||||||
|
if buffer, exists := pushBuffers[req.TaskID]; exists {
|
||||||
|
if buffer.pushTimer != nil {
|
||||||
|
buffer.pushTimer.Stop()
|
||||||
|
}
|
||||||
|
delete(pushBuffers, req.TaskID)
|
||||||
|
logger.Debug("已清理任务推送缓冲", zap.String("task_id", req.TaskID))
|
||||||
|
}
|
||||||
|
bufferMutex.Unlock()
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "任务已停止"})
|
c.JSON(http.StatusOK, gin.H{"message": "任务已停止"})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -237,7 +303,8 @@ func pushResultToBackend(taskID string, result map[string]interface{}) {
|
|||||||
logger.Warn("节点ID未获取,跳过推送结果",
|
logger.Warn("节点ID未获取,跳过推送结果",
|
||||||
zap.String("task_id", taskID),
|
zap.String("task_id", taskID),
|
||||||
zap.String("node_ip", nodeIP),
|
zap.String("node_ip", nodeIP),
|
||||||
zap.String("hint", "等待心跳返回node_id后再推送"))
|
zap.String("hint", "等待心跳返回node_id后再推送"),
|
||||||
|
zap.Any("result", result))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -246,10 +313,18 @@ func pushResultToBackend(taskID string, result map[string]interface{}) {
|
|||||||
logger.Warn("节点IP未获取,跳过推送结果",
|
logger.Warn("节点IP未获取,跳过推送结果",
|
||||||
zap.String("task_id", taskID),
|
zap.String("task_id", taskID),
|
||||||
zap.Uint("node_id", nodeID),
|
zap.Uint("node_id", nodeID),
|
||||||
zap.String("hint", "等待心跳返回node_ip后再推送"))
|
zap.String("hint", "等待心跳返回node_ip后再推送"),
|
||||||
|
zap.Any("result", result))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 记录调试信息
|
||||||
|
logger.Debug("准备推送结果到后端",
|
||||||
|
zap.String("task_id", taskID),
|
||||||
|
zap.Uint("node_id", nodeID),
|
||||||
|
zap.String("node_ip", nodeIP),
|
||||||
|
zap.Any("result", result))
|
||||||
|
|
||||||
// 添加到批量推送缓冲
|
// 添加到批量推送缓冲
|
||||||
addToPushBuffer(taskID, nodeID, nodeIP, result)
|
addToPushBuffer(taskID, nodeID, nodeIP, result)
|
||||||
}
|
}
|
||||||
@@ -269,28 +344,43 @@ func addToPushBuffer(taskID string, nodeID uint, nodeIP string, result map[strin
|
|||||||
bufferMutex.Unlock()
|
bufferMutex.Unlock()
|
||||||
|
|
||||||
buffer.mu.Lock()
|
buffer.mu.Lock()
|
||||||
defer buffer.mu.Unlock()
|
|
||||||
|
|
||||||
// 添加结果到缓冲
|
// 添加结果到缓冲
|
||||||
buffer.results = append(buffer.results, result)
|
buffer.results = append(buffer.results, result)
|
||||||
|
|
||||||
// 如果缓冲已满,立即推送
|
// 如果缓冲已满,立即推送
|
||||||
shouldFlush := len(buffer.results) >= batchPushMaxSize
|
shouldFlush := len(buffer.results) >= batchPushMaxSize
|
||||||
buffer.mu.Unlock()
|
|
||||||
|
|
||||||
if shouldFlush {
|
if shouldFlush {
|
||||||
flushPushBuffer(taskID, nodeID, nodeIP)
|
// 复制结果列表
|
||||||
|
results := make([]map[string]interface{}, len(buffer.results))
|
||||||
|
copy(results, buffer.results)
|
||||||
|
buffer.results = buffer.results[:0] // 清空缓冲
|
||||||
|
|
||||||
|
// 停止定时器
|
||||||
|
if buffer.pushTimer != nil {
|
||||||
|
buffer.pushTimer.Stop()
|
||||||
|
buffer.pushTimer = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer.lastPush = time.Now()
|
||||||
|
buffer.mu.Unlock()
|
||||||
|
|
||||||
|
// 批量推送结果
|
||||||
|
for _, r := range results {
|
||||||
|
pushSingleResult(taskID, nodeID, nodeIP, r)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
buffer.mu.Lock()
|
|
||||||
|
|
||||||
// 如果距离上次推送超过间隔时间,启动定时器推送
|
// 如果距离上次推送超过间隔时间,启动定时器推送
|
||||||
if buffer.pushTimer == nil {
|
if buffer.pushTimer == nil {
|
||||||
buffer.pushTimer = time.AfterFunc(batchPushInterval, func() {
|
buffer.pushTimer = time.AfterFunc(batchPushInterval, func() {
|
||||||
flushPushBuffer(taskID, nodeID, nodeIP)
|
flushPushBuffer(taskID, nodeID, nodeIP)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buffer.mu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
// flushPushBuffer 刷新并推送缓冲中的结果
|
// flushPushBuffer 刷新并推送缓冲中的结果
|
||||||
@@ -362,13 +452,21 @@ func pushSingleResult(taskID string, nodeID uint, nodeIP string, result map[stri
|
|||||||
|
|
||||||
jsonData, err := json.Marshal(data)
|
jsonData, err := json.Marshal(data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("序列化结果失败", zap.Error(err), zap.String("task_id", taskID))
|
logger.Error("序列化结果失败",
|
||||||
|
zap.Error(err),
|
||||||
|
zap.String("task_id", taskID),
|
||||||
|
zap.Uint("node_id", nodeID),
|
||||||
|
zap.String("node_ip", nodeIP),
|
||||||
|
zap.Any("data", data))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
|
req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("创建请求失败", zap.Error(err), zap.String("task_id", taskID))
|
logger.Error("创建请求失败",
|
||||||
|
zap.Error(err),
|
||||||
|
zap.String("task_id", taskID),
|
||||||
|
zap.String("url", url))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -380,7 +478,9 @@ func pushSingleResult(taskID string, nodeID uint, nodeIP string, result map[stri
|
|||||||
logger.Warn("推送结果失败,继续运行",
|
logger.Warn("推送结果失败,继续运行",
|
||||||
zap.Error(err),
|
zap.Error(err),
|
||||||
zap.String("task_id", taskID),
|
zap.String("task_id", taskID),
|
||||||
zap.String("url", url))
|
zap.String("url", url),
|
||||||
|
zap.Uint("node_id", nodeID),
|
||||||
|
zap.String("node_ip", nodeIP))
|
||||||
// 推送失败不停止任务,继续运行
|
// 推送失败不停止任务,继续运行
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -394,7 +494,9 @@ func pushSingleResult(taskID string, nodeID uint, nodeIP string, result map[stri
|
|||||||
if containsTaskNotFoundError(bodyStr) {
|
if containsTaskNotFoundError(bodyStr) {
|
||||||
logger.Warn("后端任务不存在,停止节点端任务",
|
logger.Warn("后端任务不存在,停止节点端任务",
|
||||||
zap.String("task_id", taskID),
|
zap.String("task_id", taskID),
|
||||||
zap.String("response", bodyStr))
|
zap.String("response", bodyStr),
|
||||||
|
zap.Uint("node_id", nodeID),
|
||||||
|
zap.String("node_ip", nodeIP))
|
||||||
// 停止对应的持续测试任务
|
// 停止对应的持续测试任务
|
||||||
stopTaskByTaskID(taskID)
|
stopTaskByTaskID(taskID)
|
||||||
return
|
return
|
||||||
@@ -404,12 +506,18 @@ func pushSingleResult(taskID string, nodeID uint, nodeIP string, result map[stri
|
|||||||
zap.Int("status", resp.StatusCode),
|
zap.Int("status", resp.StatusCode),
|
||||||
zap.String("task_id", taskID),
|
zap.String("task_id", taskID),
|
||||||
zap.String("url", url),
|
zap.String("url", url),
|
||||||
zap.String("response", bodyStr))
|
zap.String("response", bodyStr),
|
||||||
|
zap.Uint("node_id", nodeID),
|
||||||
|
zap.String("node_ip", nodeIP))
|
||||||
// 其他错误不停止任务,继续运行
|
// 其他错误不停止任务,继续运行
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Debug("推送结果成功", zap.String("task_id", taskID))
|
logger.Debug("推送结果成功",
|
||||||
|
zap.String("task_id", taskID),
|
||||||
|
zap.Uint("node_id", nodeID),
|
||||||
|
zap.String("node_ip", nodeIP),
|
||||||
|
zap.Any("result", result))
|
||||||
}
|
}
|
||||||
|
|
||||||
// containsTaskNotFoundError 检查响应中是否包含任务不存在的错误
|
// containsTaskNotFoundError 检查响应中是否包含任务不存在的错误
|
||||||
@@ -522,23 +630,20 @@ func StartTaskCleanup() {
|
|||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
taskMutex.Lock()
|
taskMutex.Lock()
|
||||||
|
var tasksToDelete []string
|
||||||
for taskID, task := range continuousTasks {
|
for taskID, task := range continuousTasks {
|
||||||
|
shouldDelete := false
|
||||||
// 检查最大运行时长
|
// 检查最大运行时长
|
||||||
if now.Sub(task.StartTime) > task.MaxDuration {
|
if now.Sub(task.StartTime) > task.MaxDuration {
|
||||||
logger.Info("任务达到最大运行时长,自动停止", zap.String("task_id", taskID))
|
logger.Info("任务达到最大运行时长,自动停止", zap.String("task_id", taskID))
|
||||||
task.IsRunning = false
|
shouldDelete = true
|
||||||
if task.pingTask != nil {
|
} else if now.Sub(task.LastRequest) > 30*time.Minute {
|
||||||
task.pingTask.Stop()
|
// 检查无客户端连接(30分钟无请求)
|
||||||
}
|
|
||||||
if task.tcpingTask != nil {
|
|
||||||
task.tcpingTask.Stop()
|
|
||||||
}
|
|
||||||
delete(continuousTasks, taskID)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// 检查无客户端连接(30分钟无请求)
|
|
||||||
if now.Sub(task.LastRequest) > 30*time.Minute {
|
|
||||||
logger.Info("任务无客户端连接,自动停止", zap.String("task_id", taskID))
|
logger.Info("任务无客户端连接,自动停止", zap.String("task_id", taskID))
|
||||||
|
shouldDelete = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if shouldDelete {
|
||||||
task.IsRunning = false
|
task.IsRunning = false
|
||||||
if task.pingTask != nil {
|
if task.pingTask != nil {
|
||||||
task.pingTask.Stop()
|
task.pingTask.Stop()
|
||||||
@@ -546,10 +651,41 @@ func StartTaskCleanup() {
|
|||||||
if task.tcpingTask != nil {
|
if task.tcpingTask != nil {
|
||||||
task.tcpingTask.Stop()
|
task.tcpingTask.Stop()
|
||||||
}
|
}
|
||||||
delete(continuousTasks, taskID)
|
|
||||||
|
// 关闭停止通道
|
||||||
|
select {
|
||||||
|
case <-task.StopCh:
|
||||||
|
// 已经关闭
|
||||||
|
default:
|
||||||
|
close(task.StopCh)
|
||||||
|
}
|
||||||
|
|
||||||
|
tasksToDelete = append(tasksToDelete, taskID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
taskMutex.Unlock()
|
taskMutex.Unlock()
|
||||||
|
|
||||||
|
// 清理任务和推送缓冲
|
||||||
|
if len(tasksToDelete) > 0 {
|
||||||
|
taskMutex.Lock()
|
||||||
|
for _, taskID := range tasksToDelete {
|
||||||
|
delete(continuousTasks, taskID)
|
||||||
|
}
|
||||||
|
taskMutex.Unlock()
|
||||||
|
|
||||||
|
// 清理推送缓冲
|
||||||
|
bufferMutex.Lock()
|
||||||
|
for _, taskID := range tasksToDelete {
|
||||||
|
if buffer, exists := pushBuffers[taskID]; exists {
|
||||||
|
if buffer.pushTimer != nil {
|
||||||
|
buffer.pushTimer.Stop()
|
||||||
|
}
|
||||||
|
delete(pushBuffers, taskID)
|
||||||
|
logger.Debug("已清理任务推送缓冲", zap.String("task_id", taskID))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bufferMutex.Unlock()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,12 +44,12 @@ func (t *timingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|||||||
port = "80"
|
port = "80"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DNS查询时间
|
// DNS查询时间
|
||||||
dnsStart := time.Now()
|
dnsStart := time.Now()
|
||||||
ips, err := net.LookupIP(host)
|
ips, err := net.LookupIP(host)
|
||||||
dnsTime := time.Since(dnsStart)
|
dnsTime := time.Since(dnsStart)
|
||||||
|
|
||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
t.nameLookup = dnsTime
|
t.nameLookup = dnsTime
|
||||||
if len(ips) > 0 {
|
if len(ips) > 0 {
|
||||||
@@ -65,11 +65,11 @@ func (t *timingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
t.mu.Unlock()
|
t.mu.Unlock()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// TCP连接时间(如果已知IP)
|
// TCP连接时间(如果已知IP)
|
||||||
var connectTime time.Duration
|
var connectTime time.Duration
|
||||||
if t.primaryIP != "" {
|
if t.primaryIP != "" {
|
||||||
@@ -80,13 +80,13 @@ func (t *timingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|||||||
conn.Close()
|
conn.Close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 执行HTTP请求
|
// 执行HTTP请求
|
||||||
httpStart := time.Now()
|
httpStart := time.Now()
|
||||||
resp, err := t.transport.RoundTrip(req)
|
resp, err := t.transport.RoundTrip(req)
|
||||||
httpTime := time.Since(httpStart)
|
httpTime := time.Since(httpStart)
|
||||||
totalTime := time.Since(start)
|
totalTime := time.Since(start)
|
||||||
|
|
||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
if connectTime > 0 {
|
if connectTime > 0 {
|
||||||
t.connect = connectTime
|
t.connect = connectTime
|
||||||
@@ -103,7 +103,7 @@ func (t *timingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
t.mu.Unlock()
|
t.mu.Unlock()
|
||||||
|
|
||||||
return resp, err
|
return resp, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,7 +114,30 @@ func handleGet(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
seq = seqVal
|
seq = seqVal
|
||||||
}
|
}
|
||||||
|
|
||||||
// 解析URL
|
// 清理URL:去除多余的空格和重复的协议前缀
|
||||||
|
urlStr = strings.TrimSpace(urlStr)
|
||||||
|
// 如果URL中包含多个 http:// 或 https://,只保留第一个
|
||||||
|
if strings.Contains(urlStr, "http://") {
|
||||||
|
// 找到第一个 http:// 的位置
|
||||||
|
firstHttp := strings.Index(urlStr, "http://")
|
||||||
|
if firstHttp > 0 {
|
||||||
|
// 如果 http:// 不在开头,说明前面有内容,需要清理
|
||||||
|
urlStr = urlStr[firstHttp:]
|
||||||
|
}
|
||||||
|
// 移除后续重复的 http://
|
||||||
|
urlStr = strings.Replace(urlStr, "http://http://", "http://", -1)
|
||||||
|
urlStr = strings.Replace(urlStr, "http://https://", "https://", -1)
|
||||||
|
}
|
||||||
|
if strings.Contains(urlStr, "https://") {
|
||||||
|
firstHttps := strings.Index(urlStr, "https://")
|
||||||
|
if firstHttps > 0 {
|
||||||
|
urlStr = urlStr[firstHttps:]
|
||||||
|
}
|
||||||
|
urlStr = strings.Replace(urlStr, "https://https://", "https://", -1)
|
||||||
|
urlStr = strings.Replace(urlStr, "https://http://", "http://", -1)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果URL没有协议前缀,添加 http://
|
||||||
if !strings.HasPrefix(urlStr, "http://") && !strings.HasPrefix(urlStr, "https://") {
|
if !strings.HasPrefix(urlStr, "http://") && !strings.HasPrefix(urlStr, "https://") {
|
||||||
urlStr = "http://" + urlStr
|
urlStr = "http://" + urlStr
|
||||||
}
|
}
|
||||||
@@ -139,17 +162,14 @@ func handleGet(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
|
|
||||||
// 创建自定义Transport用于时间跟踪
|
// 创建自定义Transport用于时间跟踪
|
||||||
timingTransport := newTimingTransport()
|
timingTransport := newTimingTransport()
|
||||||
|
|
||||||
// 创建HTTP客户端
|
// 创建HTTP客户端
|
||||||
client := &http.Client{
|
client := &http.Client{
|
||||||
Transport: timingTransport,
|
Transport: timingTransport,
|
||||||
Timeout: 15 * time.Second,
|
Timeout: 15 * time.Second,
|
||||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||||
// 跟随重定向,最多20次
|
// 不跟随重定向,返回第一个状态码和 header
|
||||||
if len(via) >= 20 {
|
return http.ErrUseLastResponse
|
||||||
return fmt.Errorf("重定向次数过多")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,8 +201,11 @@ func handleGet(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
// 执行请求
|
// 执行请求
|
||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
resp, err := client.Do(req)
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
|
||||||
// 错误处理
|
// 处理重定向错误:当 CheckRedirect 返回 ErrUseLastResponse 时,
|
||||||
|
// client.Do 会返回响应和错误,但响应仍然有效(包含重定向状态码和 header)
|
||||||
|
if err != nil && resp == nil {
|
||||||
|
// 真正的错误,没有响应
|
||||||
errMsg := err.Error()
|
errMsg := err.Error()
|
||||||
if strings.Contains(errMsg, "no such host") {
|
if strings.Contains(errMsg, "no such host") {
|
||||||
result["ip"] = "域名无法解析"
|
result["ip"] = "域名无法解析"
|
||||||
@@ -194,6 +217,26 @@ func handleGet(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
result["ip"] = "访问失败"
|
result["ip"] = "访问失败"
|
||||||
}
|
}
|
||||||
result["error"] = errMsg
|
result["error"] = errMsg
|
||||||
|
result["statuscode"] = 0
|
||||||
|
result["totaltime"] = "*"
|
||||||
|
result["downtime"] = "*"
|
||||||
|
result["downsize"] = "*"
|
||||||
|
result["downspeed"] = "*"
|
||||||
|
result["firstbytetime"] = "*"
|
||||||
|
result["conntime"] = "*"
|
||||||
|
result["size"] = "*"
|
||||||
|
c.JSON(200, result)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果有响应(包括重定向响应),继续处理
|
||||||
|
if resp != nil {
|
||||||
|
defer resp.Body.Close()
|
||||||
|
} else {
|
||||||
|
// 没有响应也没有错误,不应该发生
|
||||||
|
result["error"] = "未知错误"
|
||||||
|
result["ip"] = "访问失败"
|
||||||
|
result["statuscode"] = 0
|
||||||
result["totaltime"] = "*"
|
result["totaltime"] = "*"
|
||||||
result["downtime"] = "*"
|
result["downtime"] = "*"
|
||||||
result["downsize"] = "*"
|
result["downsize"] = "*"
|
||||||
@@ -204,7 +247,6 @@ func handleGet(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
c.JSON(200, result)
|
c.JSON(200, result)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
|
||||||
|
|
||||||
// 获取时间信息
|
// 获取时间信息
|
||||||
timingTransport.mu.Lock()
|
timingTransport.mu.Lock()
|
||||||
@@ -237,19 +279,19 @@ func handleGet(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
bodyReader := io.LimitReader(resp.Body, 1024*1024) // 限制1MB
|
bodyReader := io.LimitReader(resp.Body, 1024*1024) // 限制1MB
|
||||||
bodyStartTime := time.Now()
|
bodyStartTime := time.Now()
|
||||||
body, err := io.ReadAll(bodyReader)
|
body, err := io.ReadAll(bodyReader)
|
||||||
bodyReadTime := time.Now().Sub(bodyStartTime)
|
bodyReadTime := time.Since(bodyStartTime)
|
||||||
if err != nil && err != io.EOF {
|
if err != nil && err != io.EOF {
|
||||||
result["error"] = err.Error()
|
result["error"] = err.Error()
|
||||||
}
|
}
|
||||||
|
|
||||||
downloadSize := int64(len(body))
|
downloadSize := int64(len(body))
|
||||||
statusCode := resp.StatusCode
|
statusCode := resp.StatusCode
|
||||||
|
|
||||||
// 如果首字节时间为0,使用连接时间
|
// 如果首字节时间为0,使用连接时间
|
||||||
if firstByteTime == 0 {
|
if firstByteTime == 0 {
|
||||||
firstByteTime = connectTime
|
firstByteTime = connectTime
|
||||||
}
|
}
|
||||||
|
|
||||||
// 总时间 = 实际请求时间
|
// 总时间 = 实际请求时间
|
||||||
if totalTime == 0 {
|
if totalTime == 0 {
|
||||||
totalTime = time.Since(startTime)
|
totalTime = time.Since(startTime)
|
||||||
@@ -296,7 +338,30 @@ func handlePost(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
seq = seqVal
|
seq = seqVal
|
||||||
}
|
}
|
||||||
|
|
||||||
// 解析URL
|
// 清理URL:去除多余的空格和重复的协议前缀
|
||||||
|
urlStr = strings.TrimSpace(urlStr)
|
||||||
|
// 如果URL中包含多个 http:// 或 https://,只保留第一个
|
||||||
|
if strings.Contains(urlStr, "http://") {
|
||||||
|
// 找到第一个 http:// 的位置
|
||||||
|
firstHttp := strings.Index(urlStr, "http://")
|
||||||
|
if firstHttp > 0 {
|
||||||
|
// 如果 http:// 不在开头,说明前面有内容,需要清理
|
||||||
|
urlStr = urlStr[firstHttp:]
|
||||||
|
}
|
||||||
|
// 移除后续重复的 http://
|
||||||
|
urlStr = strings.Replace(urlStr, "http://http://", "http://", -1)
|
||||||
|
urlStr = strings.Replace(urlStr, "http://https://", "https://", -1)
|
||||||
|
}
|
||||||
|
if strings.Contains(urlStr, "https://") {
|
||||||
|
firstHttps := strings.Index(urlStr, "https://")
|
||||||
|
if firstHttps > 0 {
|
||||||
|
urlStr = urlStr[firstHttps:]
|
||||||
|
}
|
||||||
|
urlStr = strings.Replace(urlStr, "https://https://", "https://", -1)
|
||||||
|
urlStr = strings.Replace(urlStr, "https://http://", "http://", -1)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果URL没有协议前缀,添加 http://
|
||||||
if !strings.HasPrefix(urlStr, "http://") && !strings.HasPrefix(urlStr, "https://") {
|
if !strings.HasPrefix(urlStr, "http://") && !strings.HasPrefix(urlStr, "https://") {
|
||||||
urlStr = "http://" + urlStr
|
urlStr = "http://" + urlStr
|
||||||
}
|
}
|
||||||
@@ -327,16 +392,14 @@ func handlePost(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
|
|
||||||
// 创建自定义Transport用于时间跟踪
|
// 创建自定义Transport用于时间跟踪
|
||||||
timingTransport := newTimingTransport()
|
timingTransport := newTimingTransport()
|
||||||
|
|
||||||
// 创建HTTP客户端
|
// 创建HTTP客户端
|
||||||
client := &http.Client{
|
client := &http.Client{
|
||||||
Transport: timingTransport,
|
Transport: timingTransport,
|
||||||
Timeout: 15 * time.Second,
|
Timeout: 15 * time.Second,
|
||||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||||
if len(via) >= 20 {
|
// 不跟随重定向,返回第一个状态码和 header
|
||||||
return fmt.Errorf("重定向次数过多")
|
return http.ErrUseLastResponse
|
||||||
}
|
|
||||||
return nil
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -363,7 +426,11 @@ func handlePost(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
// 执行请求
|
// 执行请求
|
||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
resp, err := client.Do(req)
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
|
||||||
|
// 处理重定向错误:当 CheckRedirect 返回 ErrUseLastResponse 时,
|
||||||
|
// client.Do 会返回响应和错误,但响应仍然有效(包含重定向状态码和 header)
|
||||||
|
if err != nil && resp == nil {
|
||||||
|
// 真正的错误,没有响应
|
||||||
errMsg := err.Error()
|
errMsg := err.Error()
|
||||||
if strings.Contains(errMsg, "no such host") {
|
if strings.Contains(errMsg, "no such host") {
|
||||||
result["ip"] = "域名无法解析"
|
result["ip"] = "域名无法解析"
|
||||||
@@ -375,6 +442,26 @@ func handlePost(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
result["ip"] = "访问失败"
|
result["ip"] = "访问失败"
|
||||||
}
|
}
|
||||||
result["error"] = errMsg
|
result["error"] = errMsg
|
||||||
|
result["statuscode"] = 0
|
||||||
|
result["totaltime"] = "*"
|
||||||
|
result["downtime"] = "*"
|
||||||
|
result["downsize"] = "*"
|
||||||
|
result["downspeed"] = "*"
|
||||||
|
result["firstbytetime"] = "*"
|
||||||
|
result["conntime"] = "*"
|
||||||
|
result["size"] = "*"
|
||||||
|
c.JSON(200, result)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果有响应(包括重定向响应),继续处理
|
||||||
|
if resp != nil {
|
||||||
|
defer resp.Body.Close()
|
||||||
|
} else {
|
||||||
|
// 没有响应也没有错误,不应该发生
|
||||||
|
result["error"] = "未知错误"
|
||||||
|
result["ip"] = "访问失败"
|
||||||
|
result["statuscode"] = 0
|
||||||
result["totaltime"] = "*"
|
result["totaltime"] = "*"
|
||||||
result["downtime"] = "*"
|
result["downtime"] = "*"
|
||||||
result["downsize"] = "*"
|
result["downsize"] = "*"
|
||||||
@@ -385,7 +472,6 @@ func handlePost(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
c.JSON(200, result)
|
c.JSON(200, result)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
|
||||||
|
|
||||||
// 获取时间信息
|
// 获取时间信息
|
||||||
timingTransport.mu.Lock()
|
timingTransport.mu.Lock()
|
||||||
@@ -425,12 +511,12 @@ func handlePost(c *gin.Context, urlStr string, params map[string]interface{}) {
|
|||||||
|
|
||||||
downloadSize := int64(len(body))
|
downloadSize := int64(len(body))
|
||||||
statusCode := resp.StatusCode
|
statusCode := resp.StatusCode
|
||||||
|
|
||||||
// 如果首字节时间为0,使用连接时间
|
// 如果首字节时间为0,使用连接时间
|
||||||
if firstByteTime == 0 {
|
if firstByteTime == 0 {
|
||||||
firstByteTime = connectTime
|
firstByteTime = connectTime
|
||||||
}
|
}
|
||||||
|
|
||||||
// 总时间 = 实际请求时间
|
// 总时间 = 实际请求时间
|
||||||
if totalTime == 0 {
|
if totalTime == 0 {
|
||||||
totalTime = time.Since(startTime)
|
totalTime = time.Since(startTime)
|
||||||
|
|||||||
@@ -16,27 +16,59 @@ func handleTCPing(c *gin.Context, url string, params map[string]interface{}) {
|
|||||||
seq = seqVal
|
seq = seqVal
|
||||||
}
|
}
|
||||||
|
|
||||||
// 解析host:port格式
|
// 解析host:port格式,如果没有端口则默认80
|
||||||
parts := strings.Split(url, ":")
|
var host string
|
||||||
if len(parts) != 2 {
|
var portStr string
|
||||||
c.JSON(200, gin.H{
|
var port int
|
||||||
"seq": seq,
|
|
||||||
"type": "ceTCPing",
|
// 检查是否是IPv6格式(如 [::1]:8080)
|
||||||
"url": url,
|
if strings.HasPrefix(url, "[") {
|
||||||
"error": "格式错误,需要 host:port",
|
// IPv6格式 - 使用 Index 而不是 LastIndex 来找到第一个闭合括号
|
||||||
})
|
closeBracket := strings.Index(url, "]")
|
||||||
return
|
if closeBracket == -1 {
|
||||||
|
c.JSON(200, gin.H{
|
||||||
|
"seq": seq,
|
||||||
|
"type": "ceTCPing",
|
||||||
|
"url": url,
|
||||||
|
"error": "格式错误,IPv6地址格式应为 [host]:port",
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
host = url[1:closeBracket]
|
||||||
|
if closeBracket+1 < len(url) && url[closeBracket+1] == ':' {
|
||||||
|
portStr = url[closeBracket+2:]
|
||||||
|
// 如果端口部分为空,使用默认端口80(修复 Bug 1)
|
||||||
|
if portStr == "" {
|
||||||
|
portStr = "80"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
portStr = "80" // 默认端口
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 普通格式 host:port 或 host
|
||||||
|
lastColonIndex := strings.LastIndex(url, ":")
|
||||||
|
if lastColonIndex == -1 {
|
||||||
|
// 没有冒号,使用默认端口80
|
||||||
|
host = url
|
||||||
|
portStr = "80"
|
||||||
|
} else {
|
||||||
|
host = url[:lastColonIndex]
|
||||||
|
portStr = url[lastColonIndex+1:]
|
||||||
|
// 如果端口部分为空,使用默认端口80
|
||||||
|
if portStr == "" {
|
||||||
|
portStr = "80"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
host := parts[0]
|
var err error
|
||||||
portStr := parts[1]
|
port, err = strconv.Atoi(portStr)
|
||||||
port, err := strconv.Atoi(portStr)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(200, gin.H{
|
c.JSON(200, gin.H{
|
||||||
"seq": seq,
|
"seq": seq,
|
||||||
"type": "ceTCPing",
|
"type": "ceTCPing",
|
||||||
"url": url,
|
"url": url,
|
||||||
"error": "端口格式错误",
|
"error": "端口格式错误",
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -131,17 +163,17 @@ func handleTCPing(c *gin.Context, url string, params map[string]interface{}) {
|
|||||||
|
|
||||||
// 返回格式和PING一致
|
// 返回格式和PING一致
|
||||||
result := gin.H{
|
result := gin.H{
|
||||||
"seq": seq,
|
"seq": seq,
|
||||||
"type": "ceTCPing",
|
"type": "ceTCPing",
|
||||||
"url": url,
|
"url": url,
|
||||||
"ip": primaryIP,
|
"ip": primaryIP,
|
||||||
"host": host,
|
"host": host,
|
||||||
"port": port,
|
"port": port,
|
||||||
"packets_total": strconv.Itoa(packetsTotal),
|
"packets_total": strconv.Itoa(packetsTotal),
|
||||||
"packets_recv": strconv.Itoa(packetsRecv),
|
"packets_recv": strconv.Itoa(packetsRecv),
|
||||||
"packets_losrat": packetsLosrat, // float64类型,百分比值(如10.5表示10.5%)
|
"packets_losrat": packetsLosrat, // float64类型,百分比值(如10.5表示10.5%)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 时间字段:如果是-1(全部失败),返回字符串"-",否则返回float64
|
// 时间字段:如果是-1(全部失败),返回字符串"-",否则返回float64
|
||||||
if timeMin < 0 {
|
if timeMin < 0 {
|
||||||
result["time_min"] = "-"
|
result["time_min"] = "-"
|
||||||
@@ -160,4 +192,3 @@ func handleTCPing(c *gin.Context, url string, params map[string]interface{}) {
|
|||||||
|
|
||||||
c.JSON(200, result)
|
c.JSON(200, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -18,13 +20,13 @@ import (
|
|||||||
// 节点信息存储(通过心跳更新,优先从配置文件读取)
|
// 节点信息存储(通过心跳更新,优先从配置文件读取)
|
||||||
var nodeInfo struct {
|
var nodeInfo struct {
|
||||||
sync.RWMutex
|
sync.RWMutex
|
||||||
nodeID uint
|
nodeID uint
|
||||||
nodeIP string
|
nodeIP string
|
||||||
country string
|
country string
|
||||||
province string
|
province string
|
||||||
city string
|
city string
|
||||||
isp string
|
isp string
|
||||||
cfg *config.Config
|
cfg *config.Config
|
||||||
initialized bool
|
initialized bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -32,7 +34,7 @@ var nodeInfo struct {
|
|||||||
func InitNodeInfo(cfg *config.Config) {
|
func InitNodeInfo(cfg *config.Config) {
|
||||||
nodeInfo.Lock()
|
nodeInfo.Lock()
|
||||||
defer nodeInfo.Unlock()
|
defer nodeInfo.Unlock()
|
||||||
|
|
||||||
nodeInfo.cfg = cfg
|
nodeInfo.cfg = cfg
|
||||||
nodeInfo.nodeID = cfg.Node.ID
|
nodeInfo.nodeID = cfg.Node.ID
|
||||||
nodeInfo.nodeIP = cfg.Node.IP
|
nodeInfo.nodeIP = cfg.Node.IP
|
||||||
@@ -73,10 +75,10 @@ type Reporter struct {
|
|||||||
|
|
||||||
func NewReporter(cfg *config.Config) *Reporter {
|
func NewReporter(cfg *config.Config) *Reporter {
|
||||||
logger, _ := zap.NewProduction()
|
logger, _ := zap.NewProduction()
|
||||||
|
|
||||||
// 初始化节点信息(从配置文件读取)
|
// 初始化节点信息(从配置文件读取)
|
||||||
InitNodeInfo(cfg)
|
InitNodeInfo(cfg)
|
||||||
|
|
||||||
return &Reporter{
|
return &Reporter{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
client: &http.Client{
|
client: &http.Client{
|
||||||
@@ -88,21 +90,31 @@ func NewReporter(cfg *config.Config) *Reporter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Reporter) Start(ctx context.Context) {
|
func (r *Reporter) Start(ctx context.Context) {
|
||||||
ticker := time.NewTicker(time.Duration(r.cfg.Heartbeat.Interval) * time.Second)
|
|
||||||
defer ticker.Stop()
|
|
||||||
|
|
||||||
// 立即发送一次心跳
|
// 立即发送一次心跳
|
||||||
r.sendHeartbeat()
|
r.sendHeartbeat()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
// 计算到下一分钟第1秒的时间
|
||||||
|
now := time.Now()
|
||||||
|
nextMinute := now.Truncate(time.Minute).Add(time.Minute)
|
||||||
|
nextHeartbeatTime := nextMinute.Add(1 * time.Second)
|
||||||
|
durationUntilNext := nextHeartbeatTime.Sub(now)
|
||||||
|
|
||||||
|
// 等待到下一分钟的第1秒
|
||||||
|
timer := time.NewTimer(durationUntilNext)
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
|
timer.Stop()
|
||||||
return
|
return
|
||||||
case <-r.stopCh:
|
case <-r.stopCh:
|
||||||
|
timer.Stop()
|
||||||
return
|
return
|
||||||
case <-ticker.C:
|
case <-timer.C:
|
||||||
|
// 在每分钟的第1秒发送心跳
|
||||||
r.sendHeartbeat()
|
r.sendHeartbeat()
|
||||||
}
|
}
|
||||||
|
timer.Stop()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,10 +122,25 @@ func (r *Reporter) Stop() {
|
|||||||
close(r.stopCh)
|
close(r.stopCh)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// buildHeartbeatBody 构建心跳请求体
|
||||||
|
func buildHeartbeatBody() string {
|
||||||
|
hostname, err := os.Hostname()
|
||||||
|
if err != nil {
|
||||||
|
hostname = "unknown"
|
||||||
|
}
|
||||||
|
|
||||||
|
values := url.Values{}
|
||||||
|
values.Set("type", "pingServer")
|
||||||
|
values.Set("version", "2")
|
||||||
|
values.Set("host_name", hostname)
|
||||||
|
|
||||||
|
return values.Encode()
|
||||||
|
}
|
||||||
|
|
||||||
// RegisterNode 注册节点(安装时或首次启动时调用)
|
// RegisterNode 注册节点(安装时或首次启动时调用)
|
||||||
func RegisterNode(cfg *config.Config) error {
|
func RegisterNode(cfg *config.Config) error {
|
||||||
url := fmt.Sprintf("%s/api/node/heartbeat", cfg.Backend.URL)
|
url := fmt.Sprintf("%s/api/node/heartbeat", cfg.Backend.URL)
|
||||||
req, err := http.NewRequest("POST", url, bytes.NewBufferString("type=pingServer"))
|
req, err := http.NewRequest("POST", url, bytes.NewBufferString(buildHeartbeatBody()))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("创建心跳请求失败: %w", err)
|
return fmt.Errorf("创建心跳请求失败: %w", err)
|
||||||
}
|
}
|
||||||
@@ -123,7 +150,7 @@ func RegisterNode(cfg *config.Config) error {
|
|||||||
client := &http.Client{Timeout: 10 * time.Second}
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
resp, err := client.Do(req)
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("发送心跳失败: %w", err)
|
return fmt.Errorf("发送心跳失败 (URL: %s): %w", url, err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
@@ -173,16 +200,27 @@ func RegisterNode(cfg *config.Config) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return fmt.Errorf("心跳响应格式无效或节点信息不完整")
|
return fmt.Errorf("心跳响应格式无效或节点信息不完整 (响应体: %s)", string(body))
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Errorf("心跳请求失败,状态码: %d", resp.StatusCode)
|
// 读取响应体以便记录错误详情
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
bodyStr := ""
|
||||||
|
if err == nil && len(body) > 0 {
|
||||||
|
// 限制响应体长度,避免错误信息过长
|
||||||
|
if len(body) > 500 {
|
||||||
|
bodyStr = string(body[:500]) + "..."
|
||||||
|
} else {
|
||||||
|
bodyStr = string(body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fmt.Errorf("心跳请求失败,状态码: %d, URL: %s, 响应体: %s", resp.StatusCode, url, bodyStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Reporter) sendHeartbeat() {
|
func (r *Reporter) sendHeartbeat() {
|
||||||
// 发送心跳(使用Form格式,兼容旧接口)
|
// 发送心跳(使用Form格式,兼容旧接口)
|
||||||
url := fmt.Sprintf("%s/api/node/heartbeat", r.cfg.Backend.URL)
|
url := fmt.Sprintf("%s/api/node/heartbeat", r.cfg.Backend.URL)
|
||||||
req, err := http.NewRequest("POST", url, bytes.NewBufferString("type=pingServer"))
|
req, err := http.NewRequest("POST", url, bytes.NewBufferString(buildHeartbeatBody()))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
r.logger.Error("创建心跳请求失败", zap.Error(err))
|
r.logger.Error("创建心跳请求失败", zap.Error(err))
|
||||||
return
|
return
|
||||||
@@ -192,7 +230,9 @@ func (r *Reporter) sendHeartbeat() {
|
|||||||
|
|
||||||
resp, err := r.client.Do(req)
|
resp, err := r.client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
r.logger.Warn("发送心跳失败", zap.Error(err))
|
r.logger.Warn("发送心跳失败",
|
||||||
|
zap.String("url", url),
|
||||||
|
zap.Error(err))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
@@ -260,7 +300,21 @@ func (r *Reporter) sendHeartbeat() {
|
|||||||
}
|
}
|
||||||
r.logger.Debug("心跳发送成功")
|
r.logger.Debug("心跳发送成功")
|
||||||
} else {
|
} else {
|
||||||
r.logger.Warn("心跳发送失败", zap.Int("status", resp.StatusCode))
|
// 读取响应体以便记录错误详情
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
bodyStr := ""
|
||||||
|
if err == nil && len(body) > 0 {
|
||||||
|
// 限制响应体长度,避免日志过长
|
||||||
|
if len(body) > 500 {
|
||||||
|
bodyStr = string(body[:500]) + "..."
|
||||||
|
} else {
|
||||||
|
bodyStr = string(body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r.logger.Warn("心跳发送失败",
|
||||||
|
zap.Int("status", resp.StatusCode),
|
||||||
|
zap.String("url", url),
|
||||||
|
zap.String("response_body", bodyStr))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
53
time.sh
Normal file
53
time.sh
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "=== CentOS 7 时间同步脚本开始 ==="
|
||||||
|
|
||||||
|
# 1. 检查是否 root
|
||||||
|
if [ "$(id -u)" -ne 0 ]; then
|
||||||
|
echo "请使用 root 用户执行"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2. 设置时区
|
||||||
|
echo "[1/6] 设置时区为 Asia/Shanghai"
|
||||||
|
timedatectl set-timezone Asia/Shanghai
|
||||||
|
|
||||||
|
# 3. 安装 chrony
|
||||||
|
echo "[2/6] 安装 chrony"
|
||||||
|
if ! rpm -q chrony &>/dev/null; then
|
||||||
|
yum install -y chrony
|
||||||
|
else
|
||||||
|
echo "chrony 已安装,跳过"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4. 配置 NTP 服务器
|
||||||
|
echo "[3/6] 配置 NTP 服务器"
|
||||||
|
CONF="/etc/chrony.conf"
|
||||||
|
|
||||||
|
sed -i 's/^server /#server /g' "$CONF"
|
||||||
|
|
||||||
|
grep -q "ntp.aliyun.com" "$CONF" || cat >> "$CONF" <<EOF
|
||||||
|
|
||||||
|
# China NTP servers
|
||||||
|
server ntp.aliyun.com iburst
|
||||||
|
server ntp.tencent.com iburst
|
||||||
|
server ntp1.aliyun.com iburst
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# 5. 启动并启用 chronyd
|
||||||
|
echo "[4/6] 启动 chronyd"
|
||||||
|
systemctl enable chronyd --now
|
||||||
|
|
||||||
|
# 6. 立即强制同步
|
||||||
|
echo "[5/6] 强制同步系统时间"
|
||||||
|
chronyc -a makestep
|
||||||
|
|
||||||
|
# 7. 写入硬件时间
|
||||||
|
echo "[6/6] 写入硬件时钟"
|
||||||
|
hwclock --systohc
|
||||||
|
|
||||||
|
echo "=== 时间同步完成 ==="
|
||||||
|
echo
|
||||||
|
timedatectl status
|
||||||
2
vendor/go.uber.org/multierr/CHANGELOG.md
generated
vendored
2
vendor/go.uber.org/multierr/CHANGELOG.md
generated
vendored
@@ -61,7 +61,7 @@ v1.2.0 (2019-09-26)
|
|||||||
and `errors.Is`.
|
and `errors.Is`.
|
||||||
|
|
||||||
|
|
||||||
v1.1.0 (2017-06-30)
|
v1.1.2 (2017-06-30)
|
||||||
===================
|
===================
|
||||||
|
|
||||||
- Added an `Errors(error) []error` function to extract the underlying list of
|
- Added an `Errors(error) []error` function to extract the underlying list of
|
||||||
|
|||||||
2
vendor/go.uber.org/zap/CHANGELOG.md
generated
vendored
2
vendor/go.uber.org/zap/CHANGELOG.md
generated
vendored
@@ -489,7 +489,7 @@ Enhancements:
|
|||||||
|
|
||||||
[#402]: https://github.com/uber-go/zap/pull/402
|
[#402]: https://github.com/uber-go/zap/pull/402
|
||||||
|
|
||||||
## v1.1.0 (31 Mar 2017)
|
## v1.1.2 (31 Mar 2017)
|
||||||
|
|
||||||
This release fixes two bugs and adds some enhancements to zap's testing helpers.
|
This release fixes two bugs and adds some enhancements to zap's testing helpers.
|
||||||
It is fully backward-compatible.
|
It is fully backward-compatible.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"version": "1.1.0",
|
"version": "1.1.4",
|
||||||
"tag": "v1.1.0"
|
"tag": "v1.1.4"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user