lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-08-15 03:14:38 -04:00
Code Issues Releases Wiki Activity

switch to protojson based config for log dns router

Browse Source
This commit is contained in:
Shelikhoo
2021-09-06 18:18:22 +01:00
parent 845d031357
commit 4835b8261d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infra/conf/v5cfg/root.go
+7 -3
View File
@@ -26,7 +26,11 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
var logConfMsg *anypb.Any
if c.LogConfig != nil {
logConfMsg = serial.ToTypedMessage(c.LogConfig.Build())
logConfMsgUnpacked, err := loadHeterogeneousConfigFromRawJson("service", "log", c.LogConfig)
if err != nil {
return nil, err
}
logConfMsg = serial.ToTypedMessage(logConfMsgUnpacked)
} else {
logConfMsg = serial.ToTypedMessage(log.DefaultLogConfig())
}
@@ -35,7 +39,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
config.App = append([]*anypb.Any{logConfMsg}, config.App...)
if c.RouterConfig != nil {
routerConfig, err := c.RouterConfig.BuildV5(ctx)
routerConfig, err := loadHeterogeneousConfigFromRawJson("service", "router", c.RouterConfig)
if err != nil {
return nil, err
}
@@ -43,7 +47,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
}
if c.DNSConfig != nil {
dnsApp, err := c.DNSConfig.BuildV5(ctx)
dnsApp, err := loadHeterogeneousConfigFromRawJson("service", "dns", c.DNSConfig)
if err != nil {
return nil, newError("failed to parse DNS config").Base(err)
}