github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 12:16:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve logic related to error handling on SiteExists call

Browse Source 
No need to check if SiteExists if the config is not managed or the name
does not even qualify.
This commit is contained in:
Matthew Holt 2016-08-23 14:51:07 -06:00
parent 15d25f1ca4
commit 628920e20e
No known key found for this signature in database
GPG Key ID: 0D97CC73664F4D03
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddytls/config.go
View File

@ -133,6 +133,10 @@ func (c *Config) ObtainCert(allowPrompts bool) error {
} }
func (c *Config) obtainCertName(name string, allowPrompts bool) error { func (c *Config) obtainCertName(name string, allowPrompts bool) error {
if !c.Managed || !HostQualifies(name) {
return nil
}
storage, err := c.StorageFor(c.CAUrl) storage, err := c.StorageFor(c.CAUrl)
if err != nil { if err != nil {
return err return err
@ -143,7 +147,7 @@ func (c *Config) obtainCertName(name string, allowPrompts bool) error {
return err return err
} }
if !c.Managed || !HostQualifies(name) || siteExists { if siteExists {
return nil return nil
} }