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

Pipe and -conf flag together are an error (#315)

Browse source
This commit is contained in:
Matthew Holt 2015-11-06 13:22:22 -07:00
parent cf5aa1bed1
commit 18e9aa4d57
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
caddy/caddy.go
View file

@ -282,15 +282,7 @@ func LoadCaddyfile(loader func() (Input, error)) (cdyfile Input, err error) {
cdyfile = loadedGob.Caddyfile
}
// Otherwise, we first try to get from stdin pipe
if cdyfile == nil {
cdyfile, err = CaddyfileFromPipe(os.Stdin)
if err != nil {
return nil, err
}
}
// No piped input, so try the user's loader instead
// Try user's loader
if cdyfile == nil && loader != nil {
cdyfile, err = loader()
}

13
main.go
View file

@ -117,6 +117,19 @@ func mustLogFatal(args ...interface{}) {
}
func loadCaddyfile() (caddy.Input, error) {
// First try stdin pipe
cdyfile, err := caddy.CaddyfileFromPipe(os.Stdin)
if err != nil {
return nil, err
}
if cdyfile != nil {
// it is an error if -conf is also specified because, which to use?
if conf != "" {
return nil, errors.New("load: can't choose between stdin pipe and -conf flag")
}
return cdyfile, err
}
// -conf flag
if conf != "" {
contents, err := ioutil.ReadFile(conf)