XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 07:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: add verify command to verify if config file syntax is valid (#2389)

Browse Source
This commit is contained in:
fatedier
2021-05-12 12:15:22 +08:00
committed by GitHub
parent 630dad50ed
commit 9cebfccb39
4 changed files with 111 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/config/client.go
View File

@@ -290,7 +290,7 @@ func LoadAllProxyConfsFromIni(
for _, section := range rangeSections {
err = renderRangeProxyTemplates(f, section)
if err != nil {
return nil, nil, fmt.Errorf("fail to render range-section[%s] with error: %v", section.Name(), err)
return nil, nil, fmt.Errorf("failed to render template for proxy %s: %v", section.Name(), err)
}
}
@@ -315,7 +315,7 @@ func LoadAllProxyConfsFromIni(
case "server":
newConf, newErr := NewProxyConfFromIni(prefix, name, section)
if newErr != nil {
return nil, nil, fmt.Errorf("fail to parse section[%s], err: %v", name, newErr)
return nil, nil, fmt.Errorf("failed to parse proxy %s, err: %v", name, newErr)
}
proxyConfs[prefix+name] = newConf
case "visitor":
@@ -325,7 +325,7 @@ func LoadAllProxyConfsFromIni(
}
visitorConfs[prefix+name] = newConf
default:
return nil, nil, fmt.Errorf("section[%s] role should be 'server' or 'visitor'", name)
return nil, nil, fmt.Errorf("proxy %s role should be 'server' or 'visitor'", name)
}
}
return proxyConfs, visitorConfs, nil

2
pkg/config/proxy.go
View File

@@ -274,7 +274,7 @@ func NewProxyConfFromIni(prefix, name string, section *ini.Section) (ProxyConf,
conf := DefaultProxyConf(proxyType)
if conf == nil {
return nil, fmt.Errorf("proxy [%s] type [%s] error", name, proxyType)
return nil, fmt.Errorf("proxy %s has invalid type [%s]", name, proxyType)
}
if err := conf.UnmarshalFromIni(prefix, name, section); err != nil {