引入lumberjack和fluentbit自动分发
This commit is contained in:
@@ -20,3 +20,20 @@ func ParseHTTPAccessLogPolicyFilePath(policy *HTTPAccessLogPolicy) string {
|
||||
|
||||
return strings.TrimSpace(config.Path)
|
||||
}
|
||||
|
||||
// ParseHTTPAccessLogPolicyRotateConfig 提取访问日志策略中的文件轮转配置(所有 file* 类型有效)。
|
||||
func ParseHTTPAccessLogPolicyRotateConfig(policy *HTTPAccessLogPolicy) *serverconfigs.AccessLogRotateConfig {
|
||||
if policy == nil || !serverconfigs.IsFileBasedStorageType(policy.Type) || len(policy.Options) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
config := &serverconfigs.AccessLogFileStorageConfig{}
|
||||
if err := json.Unmarshal(policy.Options, config); err != nil {
|
||||
return nil
|
||||
}
|
||||
if config.Rotate == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return config.Rotate.Normalize()
|
||||
}
|
||||
|
||||
@@ -1176,6 +1176,7 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared
|
||||
if publicPolicy != nil {
|
||||
config.GlobalServerConfig.HTTPAccessLog.WriteTargets = serverconfigs.ParseWriteTargetsFromPolicy(publicPolicy.WriteTargets, publicPolicy.Type, publicPolicy.DisableDefaultDB)
|
||||
config.GlobalServerConfig.HTTPAccessLog.FilePath = ParseHTTPAccessLogPolicyFilePath(publicPolicy)
|
||||
config.GlobalServerConfig.HTTPAccessLog.Rotate = ParseHTTPAccessLogPolicyRotateConfig(publicPolicy)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -479,6 +479,7 @@ func (this *NSNodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64) (*dnsconfigs.
|
||||
if publicPolicy != nil {
|
||||
config.AccessLogWriteTargets = serverconfigs.ParseWriteTargetsFromPolicy(publicPolicy.WriteTargets, publicPolicy.Type, publicPolicy.DisableDefaultDB)
|
||||
config.AccessLogFilePath = ParseHTTPAccessLogPolicyFilePath(publicPolicy)
|
||||
config.AccessLogRotate = ParseHTTPAccessLogPolicyRotateConfig(publicPolicy)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -270,8 +270,9 @@ func (this *SysSettingDAO) ReadClickHouseConfig(tx *dbs.Tx) (*systemconfigs.Clic
|
||||
}
|
||||
if len(valueJSON) == 0 {
|
||||
return &systemconfigs.ClickHouseSetting{
|
||||
Port: 8123,
|
||||
Port: 8443,
|
||||
Database: "default",
|
||||
Scheme: "https",
|
||||
}, nil
|
||||
}
|
||||
var config = &systemconfigs.ClickHouseSetting{}
|
||||
|
||||
Reference in New Issue
Block a user