github-starred/frp
2
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2026-05-21 06:45:32 -06:00
Code Issues 40 Projects Packages Wiki Activity Actions 2

Reconstruct config (#2098)

Browse source 
* refactoring config

* Update by comments
This commit is contained in:
yuyulei 2021-01-26 11:31:08 +08:00 • committed by GitHub
parent a821db3f45
commit 3621aad1c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 2798 additions and 1690 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/frps/root.go
View file

@ -106,7 +106,7 @@ var rootCmd = &cobra.Command{
var err error
if cfgFile != "" {
log.Info("frps uses config file: %s", cfgFile)
var content string
var content []byte
content, err = config.GetRenderedConfFromFile(cfgFile)
if err != nil {
return err
@ -114,7 +114,7 @@ var rootCmd = &cobra.Command{
cfg, err = parseServerCommonCfg(CfgFileTypeIni, content)
} else {
log.Info("frps uses command line arguments for config")
cfg, err = parseServerCommonCfg(CfgFileTypeCmd, "")
cfg, err = parseServerCommonCfg(CfgFileTypeCmd, nil)
}
if err != nil {
return err
@ -135,9 +135,9 @@ func Execute() {
}
}
func parseServerCommonCfg(fileType int, content string) (cfg config.ServerCommonConf, err error) {
func parseServerCommonCfg(fileType int, source []byte) (cfg config.ServerCommonConf, err error) {
if fileType == CfgFileTypeIni {
cfg, err = parseServerCommonCfgFromIni(content)
cfg, err = config.UnmarshalServerConfFromIni(source)
} else if fileType == CfgFileTypeCmd {
cfg, err = parseServerCommonCfgFromCmd()
}
@ -152,14 +152,6 @@ func parseServerCommonCfg(fileType int, content string) (cfg config.ServerCommon
return
}
func parseServerCommonCfgFromIni(content string) (config.ServerCommonConf, error) {
cfg, err := config.UnmarshalServerConfFromIni(content)
if err != nil {
return config.ServerCommonConf{}, err
}
return cfg, nil
}
func parseServerCommonCfgFromCmd() (cfg config.ServerCommonConf, err error) {
cfg = config.GetDefaultServerConf()