mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-11-16 17:38:45 -05:00
61112d8af7
* Simple workaround for muti-json unable to automatically understand new config options. * Update jsonem.go
45 lines
1.0 KiB
Go
45 lines
1.0 KiB
Go
package jsonem
|
|
|
|
import (
|
|
"io"
|
|
|
|
"v2ray.com/core"
|
|
"v2ray.com/core/common"
|
|
"v2ray.com/core/common/cmdarg"
|
|
"v2ray.com/core/infra/conf"
|
|
"v2ray.com/core/infra/conf/serial"
|
|
"v2ray.com/core/main/confloader"
|
|
)
|
|
|
|
func init() {
|
|
common.Must(core.RegisterConfigLoader(&core.ConfigFormat{
|
|
Name: "JSON",
|
|
Extension: []string{"json"},
|
|
Loader: func(input interface{}) (*core.Config, error) {
|
|
switch v := input.(type) {
|
|
case cmdarg.Arg:
|
|
cf := &conf.Config{}
|
|
for i, arg := range v {
|
|
newError("Reading config: ", arg).AtInfo().WriteToLog()
|
|
r, err := confloader.LoadConfig(arg)
|
|
common.Must(err)
|
|
c, err := serial.DecodeJSONConfig(r)
|
|
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)
|
|
}
|
|
return cf.Build()
|
|
case io.Reader:
|
|
return serial.LoadJSONConfig(v)
|
|
default:
|
|
return nil, newError("unknow type")
|
|
}
|
|
},
|
|
}))
|
|
}
|