dns clickhouse改造

EdgeNode/build/build-all-plus.sh

@@ -2,8 +2,8 @@
 
 ./build.sh linux amd64 plus
 #./build.sh linux 386 plus
-./build.sh linux arm64 plus
+#./build.sh linux arm64 plus
 #./build.sh linux mips64 plus
 #./build.sh linux mips64le plus
 #./build.sh darwin amd64 plus
-#./build.sh darwin arm64 plus
+#./build.sh darwin arm64 plus

EdgeNode/build/build-all.sh

@@ -2,8 +2,8 @@
 
 ./build.sh linux amd64
 #./build.sh linux 386
-./build.sh linux arm64
+#./build.sh linux arm64
 #./build.sh linux mips64
 #./build.sh linux mips64le
 #./build.sh darwin amd64
-#./build.sh darwin arm64
+#./build.sh darwin arm64

EdgeNode/build/data/disk.speed.json

@@ -1 +1 @@
-{"speed":2,"speedMB":670,"countTests":2}
+{"speed":1,"speedMB":1400,"countTests":3}

EdgeNode/internal/accesslogs/file_writer.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -39,21 +40,73 @@ type FileWriter struct {
 
 // NewFileWriter 创建本地日志文件写入器
 func NewFileWriter() *FileWriter {
-	dir := os.Getenv(envLogDir)
-	if dir == "" {
-		dir = defaultLogDir
-	}
+	dir := resolveDefaultLogDir()
 	return &FileWriter{
 		dir:   dir,
 		files: make(map[string]*os.File),
 	}
 }
 
+func resolveDefaultLogDir() string {
+	dir := strings.TrimSpace(os.Getenv(envLogDir))
+	if dir == "" {
+		return defaultLogDir
+	}
+	return dir
+}
+
+func resolveDirFromPolicyPath(policyPath string) string {
+	policyPath = strings.TrimSpace(policyPath)
+	if policyPath == "" {
+		return ""
+	}
+
+	if strings.HasSuffix(policyPath, "/") || strings.HasSuffix(policyPath, "\\") {
+		return filepath.Clean(policyPath)
+	}
+
+	baseName := filepath.Base(policyPath)
+	if strings.Contains(baseName, ".") || strings.Contains(baseName, "${") {
+		return filepath.Clean(filepath.Dir(policyPath))
+	}
+
+	return filepath.Clean(policyPath)
+}
+
 // Dir 返回当前配置的日志目录
 func (w *FileWriter) Dir() string {
 	return w.dir
 }
 
+// SetDirByPolicyPath 使用公用日志策略 path 更新目录，空值时回退到 EDGE_LOG_DIR/default。
+func (w *FileWriter) SetDirByPolicyPath(policyPath string) {
+	dir := resolveDirFromPolicyPath(policyPath)
+	w.SetDir(dir)
+}
+
+// SetDir 更新日志目录并重置文件句柄。
+func (w *FileWriter) SetDir(dir string) {
+	if strings.TrimSpace(dir) == "" {
+		dir = resolveDefaultLogDir()
+	}
+
+	w.mu.Lock()
+	defer w.mu.Unlock()
+
+	if dir == w.dir {
+		return
+	}
+
+	for name, f := range w.files {
+		if f != nil {
+			_ = f.Close()
+		}
+		w.files[name] = nil
+	}
+	w.inited = false
+	w.dir = dir
+}
+
 // IsEnabled 是否启用落盘（目录非空即视为启用）
 func (w *FileWriter) IsEnabled() bool {
 	return w.dir != ""

EdgeNode/internal/nodes/node.go

@@ -887,6 +887,12 @@ func (this *Node) onReload(config *nodeconfigs.NodeConfig, reloadAll bool) {
 	nodeconfigs.ResetNodeConfig(config)
 	sharedNodeConfig = config
 
+	var accessLogFilePath string
+	if config != nil && config.GlobalServerConfig != nil {
+		accessLogFilePath = config.GlobalServerConfig.HTTPAccessLog.FilePath
+	}
+	accesslogs.SharedFileWriter().SetDirByPolicyPath(accessLogFilePath)
+
 	// 并发读写数
 	fsutils.ReaderLimiter.SetThreads(config.MaxConcurrentReads)
 	fsutils.WriterLimiter.SetThreads(config.MaxConcurrentWrites)