This reverts commit eaf401eda9.
This commit is contained in:
2 files changed
+3
-12
No files matched your search
@@ -2,7 +2,6 @@ package serial
|
||||
|
||||
import (
|
||||
"io"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/xtls/xray-core/core"
|
||||
"github.com/xtls/xray-core/infra/conf"
|
||||
@@ -11,11 +10,7 @@ import (
|
||||
|
||||
func BuildConfig(files []string, formats []string) (*core.Config, error) {
|
||||
cf := &conf.Config{}
|
||||
for i, file_ := range files {
|
||||
file, err := filepath.EvalSymlinks(file_)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for i, file := range files {
|
||||
newError("Reading config: ", file).AtInfo().WriteToLog()
|
||||
r, err := confloader.LoadConfig(file)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user