lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-07-26 11:44:22 -04:00
Code Issues Releases Wiki Activity

Workaround for muti-json's hard coded override method (#409)

Browse Source 
* Simple workaround for muti-json unable to automatically understand new config options.

* Update jsonem.go
This commit is contained in:
Xiaokang Wang 2020-11-20 18:50:46 +00:00 committed by GitHub
parent f96fe0b35d
commit 61112d8af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/jsonem/jsonem.go
View File

@ -19,12 +19,18 @@ func init() {
switch v := input.(type) { switch v := input.(type) {
case cmdarg.Arg: case cmdarg.Arg:
cf := &conf.Config{} cf := &conf.Config{}
for _, arg := range v { for i, arg := range v {
newError("Reading config: ", arg).AtInfo().WriteToLog() newError("Reading config: ", arg).AtInfo().WriteToLog()
r, err := confloader.LoadConfig(arg) r, err := confloader.LoadConfig(arg)
common.Must(err) common.Must(err)
c, err := serial.DecodeJSONConfig(r) c, err := serial.DecodeJSONConfig(r)
common.Must(err) common.Must(err)
if i == 0 {
// This ensure even if the muti-json parser do not support a setting,
// It is still respected automatically for the first configure file
*cf = *c
continue
}
cf.Override(c, arg) cf.Override(c, arg)
} }
return cf.Build() return cf.Build()