mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-14 20:39:36 +03:00
Code Issues Releases Activity

Style: format code by gofumpt (#761)

Browse Source
This commit is contained in:
yuhan6665
2021-10-19 12:57:14 -04:00
committed by GitHub
parent d77be80b40
commit e286cdcaa8
111 changed files with 293 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/run.go
View File

@ -39,7 +39,7 @@ without launching the server
}
func init() {
cmdRun.Run = executeRun //break init loop
cmdRun.Run = executeRun // break init loop
}
var (
@ -52,7 +52,6 @@ var (
* main func in this file is run.
*/
_ = func() bool {
cmdRun.Flag.Var(&configFiles, "config", "Config path for Xray.")
cmdRun.Flag.Var(&configFiles, "c", "Short alias of -config")
cmdRun.Flag.StringVar(&configDir, "confdir", "", "A dir with multiple json config")
@ -181,10 +180,9 @@ func getConfigFormat() string {
func startXray() (core.Server, error) {
configFiles := getConfigFilePath()
//config, err := core.LoadConfig(getConfigFormat(), configFiles[0], configFiles)
// config, err := core.LoadConfig(getConfigFormat(), configFiles[0], configFiles)
c, err := core.LoadConfig(getConfigFormat(), configFiles)
if err != nil {
return nil, newError("failed to load config files: [", configFiles.String(), "]").Base(err)
}