mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-09-19 22:59:20 +03:00
079d0bd8a9
* Refactor log * Add new log methods * Fix logger test * Change all logging code * Clean up pathObj * Rebase to latest main * Remove invoking method name after the dot
67 lines
1.6 KiB
Go
67 lines
1.6 KiB
Go
package serial
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
creflect "github.com/xtls/xray-core/common/reflect"
|
|
"github.com/xtls/xray-core/core"
|
|
"github.com/xtls/xray-core/infra/conf"
|
|
"github.com/xtls/xray-core/main/confloader"
|
|
)
|
|
|
|
func MergeConfigFromFiles(files []string, formats []string) (string, error) {
|
|
c, err := mergeConfigs(files, formats)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
if j, ok := creflect.MarshalToJson(c); ok {
|
|
return j, nil
|
|
}
|
|
return "", errors.New("marshal to json failed.").AtError()
|
|
}
|
|
|
|
func mergeConfigs(files []string, formats []string) (*conf.Config, error) {
|
|
cf := &conf.Config{}
|
|
for i, file := range files {
|
|
errors.LogInfo(context.Background(), "Reading config: ", file)
|
|
r, err := confloader.LoadConfig(file)
|
|
if err != nil {
|
|
return nil, errors.New("failed to read config: ", file).Base(err)
|
|
}
|
|
c, err := ReaderDecoderByFormat[formats[i]](r)
|
|
if err != nil {
|
|
return nil, errors.New("failed to decode config: ", file).Base(err)
|
|
}
|
|
if i == 0 {
|
|
*cf = *c
|
|
continue
|
|
}
|
|
cf.Override(c, file)
|
|
}
|
|
return cf, nil
|
|
}
|
|
|
|
func BuildConfig(files []string, formats []string) (*core.Config, error) {
|
|
config, err := mergeConfigs(files, formats)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return config.Build()
|
|
}
|
|
|
|
type readerDecoder func(io.Reader) (*conf.Config, error)
|
|
|
|
var ReaderDecoderByFormat = make(map[string]readerDecoder)
|
|
|
|
func init() {
|
|
ReaderDecoderByFormat["json"] = DecodeJSONConfig
|
|
ReaderDecoderByFormat["yaml"] = DecodeYAMLConfig
|
|
ReaderDecoderByFormat["toml"] = DecodeTOMLConfig
|
|
|
|
core.ConfigBuilderForFiles = BuildConfig
|
|
core.ConfigMergedFormFiles = MergeConfigFromFiles
|
|
}
|