cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 9ffe1ee714 into 371c401f5b

Browse Source
This commit is contained in:
shuaihanhungry 2018-04-28 02:38:23 +00:00 committed by GitHub
commit c4d278ea34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/frps/root.go
View File

@ -82,13 +82,17 @@ var rootCmd = &cobra.Command{
return nil return nil
} }
var err error
if cfgFile != "" { if cfgFile != "" {
parseServerCommonCfg(CfgFileTypeIni, cfgFile) err = parseServerCommonCfg(CfgFileTypeIni, cfgFile)
} else { } else {
parseServerCommonCfg(CfgFileTypeCmd, "") err = parseServerCommonCfg(CfgFileTypeCmd, "")
}
if err != nil {
return err
} }
err := runServer() err = runServer()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
@ -113,8 +117,6 @@ func parseServerCommonCfg(fileType int, filePath string) (err error) {
return return
} }
g.GlbServerCfg.CfgFile = cfgFile
err = g.GlbServerCfg.ServerCommonConf.Check() err = g.GlbServerCfg.ServerCommonConf.Check()
if err != nil { if err != nil {
return return
@ -136,6 +138,7 @@ func parseServerCommonCfgFromIni(filePath string) (err error) {
return err return err
} }
g.GlbServerCfg.ServerCommonConf = *cfg g.GlbServerCfg.ServerCommonConf = *cfg
g.GlbServerCfg.CfgFile = filePath
return return
} }