mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-12 11:29: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

2
main/commands/all/commands.go
View File

@ -12,7 +12,7 @@ func init() {
base.RootCommand.Commands = append(
base.RootCommand.Commands,
api.CmdAPI,
//cmdConvert,
// cmdConvert,
tls.CmdTLS,
cmdUUID,
)

4
main/commands/all/tls/ping.go
View File

@ -27,9 +27,7 @@ func init() {
cmdPing.Run = executePing // break init loop
}
var (
pingIPStr = cmdPing.Flag.String("ip", "", "")
)
var pingIPStr = cmdPing.Flag.String("ip", "", "")
func executePing(cmd *base.Command, args []string) {
if cmdPing.Flag.NArg() < 1 {

6
main/commands/base/command.go
View File

@ -113,8 +113,10 @@ func ExitIfErrors() {
}
}
var exitStatus = 0
var exitMu sync.Mutex
var (
exitStatus = 0
exitMu sync.Mutex
)
// SetExitStatus set exit status code
func SetExitStatus(n int) {

6
main/confloader/confloader.go
View File

@ -5,8 +5,10 @@ import (
"os"
)
type configFileLoader func(string) (io.Reader, error)
type extconfigLoader func([]string, io.Reader) (io.Reader, error)
type (
configFileLoader func(string) (io.Reader, error)
extconfigLoader func([]string, io.Reader) (io.Reader, error)
)
var (
EffectiveConfigFileLoader configFileLoader

18
main/main.go
View File

@ -37,20 +37,20 @@ func getArgsV4Compatible() []string {
fs.SetOutput(&null{})
err := fs.Parse(os.Args[1:])
if err == flag.ErrHelp {
//fmt.Println("DEPRECATED: -h, WILL BE REMOVED IN V5.")
//fmt.Println("PLEASE USE: xray help")
//fmt.Println()
// fmt.Println("DEPRECATED: -h, WILL BE REMOVED IN V5.")
// fmt.Println("PLEASE USE: xray help")
// fmt.Println()
return []string{os.Args[0], "help"}
}
if version {
//fmt.Println("DEPRECATED: -version, WILL BE REMOVED IN V5.")
//fmt.Println("PLEASE USE: xray version")
//fmt.Println()
// fmt.Println("DEPRECATED: -version, WILL BE REMOVED IN V5.")
// fmt.Println("PLEASE USE: xray version")
// fmt.Println()
return []string{os.Args[0], "version"}
}
//fmt.Println("COMPATIBLE MODE, DEPRECATED.")
//fmt.Println("PLEASE USE: xray run [arguments] INSTEAD.")
//fmt.Println()
// fmt.Println("COMPATIBLE MODE, DEPRECATED.")
// fmt.Println("PLEASE USE: xray run [arguments] INSTEAD.")
// fmt.Println()
return append([]string{os.Args[0], "run"}, os.Args[1:]...)
}

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)
}