mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-30 17:38:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Config loader returns error instead of directly panic (#80)

Browse source
This commit is contained in:
Jim Han 2020-12-16 20:35:27 +08:00 • committed by GitHub
parent fe445f8e1a
commit 19ce0e99a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/run.go
View file

@ -164,7 +164,7 @@ func startXray() (core.Server, error) {
config, err := core.LoadConfig(getConfigFormat(), configFiles[0], configFiles)
if err != nil {
return nil, newError("failed to read config files: [", configFiles.String(), "]").Base(err)
return nil, newError("failed to load config files: [", configFiles.String(), "]").Base(err)
}
server, err := core.New(config)