Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Only a warning if site root doesn't exist

Browse source
This commit is contained in:
Matthew Holt 2015-05-01 16:23:28 -06:00
parent d11819721d
commit 782ba32457
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/directives.go
View file

@ -1,6 +1,8 @@
package config package config
import ( import (
"fmt"
"log"
"os" "os"
"os/exec" "os/exec"
@ -30,12 +32,14 @@ func init() {
p.cfg.Root = p.tkn() p.cfg.Root = p.tkn()
// Ensure root folder exists // Ensure root folder exists
_, err := os.Stat(p.cfg.Root) _, err := os.Open(p.cfg.Root)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return p.err("Path", "Root path "+p.cfg.Root+" does not exist") // Allow this, because the folder might appear later.
// But make sure the user knows!
log.Printf("Warning: Root path %s does not exist", p.cfg.Root)
} else { } else {
return p.err("Path", "Unable to access root path "+p.cfg.Root) return p.err("Path", fmt.Sprintf("Unable to access root path '%s': %s", p.cfg.Root, err.Error()))
} }
} }
return nil return nil