lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-18 02:16:10 -05:00
Code Issues Releases Wiki Activity

fix: improve error messages when parsing config in jsonv5

Browse Source
This commit is contained in:
OurebiKitsu 2023-09-17 00:30:03 +00:00 committed by Xiaokang Wang (Shelikhoo)
parent 21b7a0046b
commit b0919678b3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infra/conf/v5cfg/root.go
View File

@ -3,6 +3,7 @@ package v5cfg
import (
"context"
"encoding/json"
"fmt"
"github.com/golang/protobuf/proto"
"google.golang.org/protobuf/types/known/anypb"
@ -30,7 +31,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
if c.LogConfig != nil {
logConfMsgUnpacked, err := loadHeterogeneousConfigFromRawJSON("service", "log", c.LogConfig)
if err != nil {
return nil, err
return nil, newError("failed to parse Log config").Base(err)
}
logConfMsg = serial.ToTypedMessage(logConfMsgUnpacked)
} else {
@ -43,7 +44,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
if c.RouterConfig != nil {
routerConfig, err := loadHeterogeneousConfigFromRawJSON("service", "router", c.RouterConfig)
if err != nil {
return nil, err
return nil, newError("failed to parse Router config").Base(err)
}
config.App = append(config.App, serial.ToTypedMessage(routerConfig))
}
@ -75,7 +76,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
for serviceName, service := range c.Services {
servicePackedConfig, err := loadHeterogeneousConfigFromRawJSON("service", serviceName, service)
if err != nil {
return nil, err
return nil, newError(fmt.Sprintf("failed to parse %v config in Services", serviceName)).Base(err)
}
config.App = append(config.App, serial.ToTypedMessage(servicePackedConfig))
}