dns clickhouse改造

EdgeAPI/internal/accesslogs/storage_manager.go

@@ -80,7 +80,7 @@ func (this *StorageManager) Loop() error {
 
 			if int64(policy.Id) == publicPolicyId {
 				this.disableDefaultDB = policy.DisableDefaultDB
-				this.writeTargets = serverconfigs.ResolveWriteTargetsByType(policy.Type, policy.DisableDefaultDB)
+				this.writeTargets = serverconfigs.ParseWriteTargetsFromPolicy(policy.WriteTargets, policy.Type, policy.DisableDefaultDB)
 				foundPolicy = true
 			}
 		}

EdgeAPI/internal/db/models/http_access_log_policy_dao.go

@@ -108,7 +108,6 @@ func (this *HTTPAccessLogPolicyDAO) FindAllEnabledAndOnPolicies(tx *dbs.Tx) (res
 
 // CreatePolicy 创建策略
 func (this *HTTPAccessLogPolicyDAO) CreatePolicy(tx *dbs.Tx, name string, policyType string, optionsJSON []byte, condsJSON []byte, isPublic bool, firewallOnly bool, disableDefaultDB bool, writeTargetsJSON []byte) (policyId int64, err error) {
-	_ = writeTargetsJSON
 	var op = NewHTTPAccessLogPolicyOperator()
 	op.Name = name
 	op.Type = policyType
@@ -122,14 +121,17 @@ func (this *HTTPAccessLogPolicyDAO) CreatePolicy(tx *dbs.Tx, name string, policy
 	op.IsOn = true
 	op.FirewallOnly = firewallOnly
 	op.DisableDefaultDB = disableDefaultDB
-	op.WriteTargets = dbs.SQL("NULL")
+	if len(writeTargetsJSON) > 0 {
+		op.WriteTargets = writeTargetsJSON
+	} else {
+		op.WriteTargets = "{}"
+	}
 	op.State = HTTPAccessLogPolicyStateEnabled
 	return this.SaveInt64(tx, op)
 }
 
 // UpdatePolicy 修改策略
 func (this *HTTPAccessLogPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, name string, policyType string, optionsJSON []byte, condsJSON []byte, isPublic bool, firewallOnly bool, disableDefaultDB bool, writeTargetsJSON []byte, isOn bool) error {
-	_ = writeTargetsJSON
 	if policyId <= 0 {
 		return errors.New("invalid policyId")
 	}
@@ -167,7 +169,11 @@ func (this *HTTPAccessLogPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, nam
 	op.IsPublic = isPublic
 	op.FirewallOnly = firewallOnly
 	op.DisableDefaultDB = disableDefaultDB
-	op.WriteTargets = dbs.SQL("NULL")
+	if len(writeTargetsJSON) > 0 {
+		op.WriteTargets = writeTargetsJSON
+	} else {
+		op.WriteTargets = "{}"
+	}
 	op.IsOn = isOn
 	return this.Save(tx, op)
 }

EdgeAPI/internal/db/models/node_dao.go

@@ -1174,7 +1174,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared
 			if publicPolicyId > 0 {
 				publicPolicy, _ := SharedHTTPAccessLogPolicyDAO.FindEnabledHTTPAccessLogPolicy(tx, publicPolicyId)
 				if publicPolicy != nil {
-					config.GlobalServerConfig.HTTPAccessLog.WriteTargets = serverconfigs.ResolveWriteTargetsByType(publicPolicy.Type, publicPolicy.DisableDefaultDB)
+					config.GlobalServerConfig.HTTPAccessLog.WriteTargets = serverconfigs.ParseWriteTargetsFromPolicy(publicPolicy.WriteTargets, publicPolicy.Type, publicPolicy.DisableDefaultDB)
 					config.GlobalServerConfig.HTTPAccessLog.FilePath = ParseHTTPAccessLogPolicyFilePath(publicPolicy)
 				}
 			}

EdgeAPI/internal/db/models/ns_node_dao_plus.go

@@ -477,7 +477,7 @@ func (this *NSNodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64) (*dnsconfigs.
 		if publicPolicyId > 0 {
 			publicPolicy, _ := SharedHTTPAccessLogPolicyDAO.FindEnabledHTTPAccessLogPolicy(tx, publicPolicyId)
 			if publicPolicy != nil {
-				config.AccessLogWriteTargets = serverconfigs.ResolveWriteTargetsByType(publicPolicy.Type, publicPolicy.DisableDefaultDB)
+				config.AccessLogWriteTargets = serverconfigs.ParseWriteTargetsFromPolicy(publicPolicy.WriteTargets, publicPolicy.Type, publicPolicy.DisableDefaultDB)
 				config.AccessLogFilePath = ParseHTTPAccessLogPolicyFilePath(publicPolicy)
 			}
 		}

EdgeAPI/internal/rpc/services/service_http_access_log_policy_plus.go

@@ -4,6 +4,7 @@ package services
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"github.com/TeaOSLab/EdgeAPI/internal/accesslogs"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
@@ -15,18 +16,23 @@ type HTTPAccessLogPolicyService struct {
 	BaseService
 }
 
-func (this *HTTPAccessLogPolicyService) normalizeStorageTypeAndTargets(policyType string, writeTargetsJSON []byte, disableDefaultDB bool) (string, []byte) {
-	_ = writeTargetsJSON
-	_ = disableDefaultDB
-
-	// 兼容旧前端/缓存可能传来的历史类型编码
-	switch policyType {
-	case "clickhouse":
-		policyType = serverconfigs.AccessLogStorageTypeFileClickhouse
-	case "mysql_clickhouse":
-		policyType = serverconfigs.AccessLogStorageTypeFileMySQLClickhouse
+func (this *HTTPAccessLogPolicyService) normalizeStorageTypeAndTargets(policyType string, disableDefaultDB bool) (string, []byte, error) {
+	normalizedType := serverconfigs.NormalizeAccessLogStorageType(policyType)
+	targets := serverconfigs.BuildWriteTargetsByStorageType(normalizedType, disableDefaultDB)
+	if targets == nil {
+		return "", nil, errors.New("invalid access log storage type")
 	}
-	return policyType, nil
+
+	writeTargetsMap := map[string]bool{
+		"file":       targets.File,
+		"mysql":      targets.MySQL,
+		"clickhouse": targets.ClickHouse,
+	}
+	writeTargetsJSON, err := json.Marshal(writeTargetsMap)
+	if err != nil {
+		return "", nil, err
+	}
+	return normalizedType, writeTargetsJSON, nil
 }
 
 // CountAllHTTPAccessLogPolicies 计算访问日志策略数量
@@ -68,7 +74,7 @@ func (this *HTTPAccessLogPolicyService) ListHTTPAccessLogPolicies(ctx context.Co
 			IsPublic:         policy.IsPublic,
 			FirewallOnly:     policy.FirewallOnly == 1,
 			DisableDefaultDB: policy.DisableDefaultDB,
-			WriteTargetsJSON: nil,
+			WriteTargetsJSON: policy.WriteTargets,
 		})
 	}
 	return &pb.ListHTTPAccessLogPoliciesResponse{HttpAccessLogPolicies: pbPolicies}, nil
@@ -91,7 +97,10 @@ func (this *HTTPAccessLogPolicyService) CreateHTTPAccessLogPolicy(ctx context.Co
 		}
 	}
 
-	policyType, writeTargetsJSON := this.normalizeStorageTypeAndTargets(req.Type, req.WriteTargetsJSON, req.DisableDefaultDB)
+	policyType, writeTargetsJSON, err := this.normalizeStorageTypeAndTargets(req.Type, req.DisableDefaultDB)
+	if err != nil {
+		return nil, err
+	}
 
 	// 创建
 	policyId, err := models.SharedHTTPAccessLogPolicyDAO.CreatePolicy(tx, req.Name, policyType, req.OptionsJSON, req.CondsJSON, req.IsPublic, req.FirewallOnly, req.DisableDefaultDB, writeTargetsJSON)
@@ -118,7 +127,10 @@ func (this *HTTPAccessLogPolicyService) UpdateHTTPAccessLogPolicy(ctx context.Co
 		}
 	}
 
-	policyType, writeTargetsJSON := this.normalizeStorageTypeAndTargets(req.Type, req.WriteTargetsJSON, req.DisableDefaultDB)
+	policyType, writeTargetsJSON, err := this.normalizeStorageTypeAndTargets(req.Type, req.DisableDefaultDB)
+	if err != nil {
+		return nil, err
+	}
 
 	// 保存修改
 	err = models.SharedHTTPAccessLogPolicyDAO.UpdatePolicy(tx, req.HttpAccessLogPolicyId, req.Name, policyType, req.OptionsJSON, req.CondsJSON, req.IsPublic, req.FirewallOnly, req.DisableDefaultDB, writeTargetsJSON, req.IsOn)
@@ -153,7 +165,7 @@ func (this *HTTPAccessLogPolicyService) FindHTTPAccessLogPolicy(ctx context.Cont
 		IsPublic:         policy.IsPublic,
 		FirewallOnly:     policy.FirewallOnly == 1,
 		DisableDefaultDB: policy.DisableDefaultDB,
-		WriteTargetsJSON: nil,
+		WriteTargetsJSON: policy.WriteTargets,
 	}}, nil
 }