tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-09-28 05:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新代理节点配置，支持 Docker 模式下的路径管理，添加相关测试用例

Browse Source
This commit is contained in:
ryan
2026-03-09 23:43:33 +08:00
parent c4f314f2c5
commit ff09c2bf6c
7 changed files with 143 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atsf_agent/agent.json
+4 -4
View File
@@ -5,10 +5,10 @@
"node_ip": "10.0.0.8",
"agent_version": "0.1.0",
"nginx_version": "1.25.5",
"route_config_path": "./etc/nginx/conf.d/atsflare_routes.conf",
"state_path": "./var/lib/atsflare/agent-state.json",
"nginx_binary": "nginx",
"data_dir": "./data",
"nginx_container_name": "atsflare-nginx",
"nginx_docker_image": "nginx:stable-alpine",
"heartbeat_interval": 30000000000,
"sync_interval": 30000000000,
"request_timeout": 10000000000
}
}
atsf_agent/internal/config/config.go
+23 -8
View File
@@ -8,6 +8,11 @@ import (
"time"
)
const (
defaultDockerRouteConfigRelativePath = "etc/nginx/conf.d/atsflare_routes.conf"
defaultDockerStateRelativePath = "var/lib/atsflare/agent-state.json"
)
type Config struct {
ServerURL string `json:"server_url"`
AgentToken string `json:"agent_token"`
@@ -19,6 +24,7 @@ type Config struct {
NginxContainerName string `json:"nginx_container_name"`
NginxDockerImage string `json:"nginx_docker_image"`
DockerBinary string `json:"docker_binary"`
DataDir string `json:"data_dir"`
RouteConfigPath string `json:"route_config_path"`
StatePath string `json:"state_path"`
HeartbeatInterval time.Duration `json:"heartbeat_interval"`
@@ -35,23 +41,18 @@ func Load(path string) (*Config, error) {
if err = json.Unmarshal(data, cfg); err != nil {
return nil, err
}
applyDefaults(cfg)
applyDefaults(cfg, filepath.Dir(path))
if err = validate(cfg); err != nil {
return nil, err
}
return cfg, nil
}
func applyDefaults(cfg *Config) {
func applyDefaults(cfg *Config, baseDir string) {
baseDir = filepath.Clean(baseDir)
if cfg.AgentVersion == "" {
cfg.AgentVersion = "dev"
}
if cfg.RouteConfigPath == "" {
cfg.RouteConfigPath = filepath.Clean("./atsflare_routes.conf")
}
if cfg.StatePath == "" {
cfg.StatePath = filepath.Clean("./atsf_agent_state.json")
}
if cfg.NginxContainerName == "" {
cfg.NginxContainerName = "atsflare-nginx"
}
@@ -61,6 +62,20 @@ func applyDefaults(cfg *Config) {
if cfg.DockerBinary == "" {
cfg.DockerBinary = "docker"
}
if cfg.DataDir == "" {
cfg.DataDir = filepath.Join(baseDir, "data")
}
if cfg.NginxPath == "" {
cfg.RouteConfigPath = filepath.Join(cfg.DataDir, defaultDockerRouteConfigRelativePath)
cfg.StatePath = filepath.Join(cfg.DataDir, defaultDockerStateRelativePath)
} else {
if cfg.RouteConfigPath == "" {
cfg.RouteConfigPath = filepath.Join(cfg.DataDir, defaultDockerRouteConfigRelativePath)
}
if cfg.StatePath == "" {
cfg.StatePath = filepath.Join(cfg.DataDir, defaultDockerStateRelativePath)
}
}
if cfg.HeartbeatInterval <= 0 {
cfg.HeartbeatInterval = 30 * time.Second
}
atsf_agent/internal/config/config_test.go
+107
View File
@@ -0,0 +1,107 @@
package config
import (
"encoding/json"
"os"
"path/filepath"
"testing"
)
func TestLoadDockerModeUsesManagedPaths(t *testing.T) {
dir := t.TempDir()
configPath := filepath.Join(dir, "agent.json")
payload := map[string]any{
"server_url": "http://127.0.0.1:3000",
"agent_token": "token",
"node_name": "edge-01",
"node_ip": "10.0.0.8",
"agent_version": "0.1.0",
}
data, err := json.Marshal(payload)
if err != nil {
t.Fatalf("failed to marshal config: %v", err)
}
if err = os.WriteFile(configPath, data, 0o644); err != nil {
t.Fatalf("failed to write config: %v", err)
}
cfg, err := Load(configPath)
if err != nil {
t.Fatalf("Load failed: %v", err)
}
if cfg.DataDir != filepath.Join(dir, "data") {
t.Fatalf("unexpected data dir: %s", cfg.DataDir)
}
if cfg.RouteConfigPath != filepath.Join(dir, "data", defaultDockerRouteConfigRelativePath) {
t.Fatalf("unexpected route config path: %s", cfg.RouteConfigPath)
}
if cfg.StatePath != filepath.Join(dir, "data", defaultDockerStateRelativePath) {
t.Fatalf("unexpected state path: %s", cfg.StatePath)
}
}
func TestLoadPathModeKeepsExplicitPaths(t *testing.T) {
dir := t.TempDir()
configPath := filepath.Join(dir, "agent.json")
payload := map[string]any{
"server_url": "http://127.0.0.1:3000",
"agent_token": "token",
"node_name": "edge-01",
"node_ip": "10.0.0.8",
"nginx_path": "/opt/nginx/sbin/nginx",
"route_config_path": "/tmp/routes.conf",
"state_path": "/tmp/agent-state.json",
}
data, err := json.Marshal(payload)
if err != nil {
t.Fatalf("failed to marshal config: %v", err)
}
if err = os.WriteFile(configPath, data, 0o644); err != nil {
t.Fatalf("failed to write config: %v", err)
}
cfg, err := Load(configPath)
if err != nil {
t.Fatalf("Load failed: %v", err)
}
if cfg.RouteConfigPath != "/tmp/routes.conf" {
t.Fatalf("unexpected route config path: %s", cfg.RouteConfigPath)
}
if cfg.StatePath != "/tmp/agent-state.json" {
t.Fatalf("unexpected state path: %s", cfg.StatePath)
}
}
func TestLoadUsesCustomDataDirForGeneratedFiles(t *testing.T) {
dir := t.TempDir()
configPath := filepath.Join(dir, "agent.json")
payload := map[string]any{
"server_url": "http://127.0.0.1:3000",
"agent_token": "token",
"node_name": "edge-01",
"node_ip": "10.0.0.8",
"data_dir": "/srv/atsflare",
"agent_version": "0.1.0",
}
data, err := json.Marshal(payload)
if err != nil {
t.Fatalf("failed to marshal config: %v", err)
}
if err = os.WriteFile(configPath, data, 0o644); err != nil {
t.Fatalf("failed to write config: %v", err)
}
cfg, err := Load(configPath)
if err != nil {
t.Fatalf("Load failed: %v", err)
}
if cfg.RouteConfigPath != "/srv/atsflare/"+defaultDockerRouteConfigRelativePath {
t.Fatalf("unexpected route config path: %s", cfg.RouteConfigPath)
}
if cfg.StatePath != "/srv/atsflare/"+defaultDockerStateRelativePath {
t.Fatalf("unexpected state path: %s", cfg.StatePath)
}
}
atsf_agent/var/lib/atsflare/agent-state.json
-6
View File
@@ -1,6 +0,0 @@
{
"node_id": "node-272a017338e3b01c",
"current_version": "",
"current_checksum": "",
"last_error": "nginx -t failed: exec: \"nginx\": executable file not found in $PATH: "
}