serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-28 14:43:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #56 from abiosoft/master

Browse source 
server: read -conf flag before reading stdin config
This commit is contained in:
Abiola Ibrahim 2015-05-06 03:34:25 +01:00
commit 69eb5cdd8e
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
main.go
View file

@ -24,7 +24,6 @@ var (
http2 bool // TODO: temporary flag until http2 is standard
quiet bool
cpu string
confBody []byte // configuration data to use, piped from stdin
)
func init() {
@ -39,18 +38,6 @@ func init() {
config.AppName = "Caddy"
config.AppVersion = "0.6.0"
// Load piped configuration data, if any
fi, err := os.Stdin.Stat()
if err != nil {
log.Fatal(err)
}
if fi.Mode()&os.ModeCharDevice == 0 {
confBody, err = ioutil.ReadAll(os.Stdin)
if err != nil {
log.Fatal(err)
}
}
}
func main() {
@ -117,8 +104,19 @@ func loadConfigs() ([]server.Config, error) {
}
// stdin
if len(confBody) > 0 {
return config.Load("stdin", bytes.NewReader(confBody))
// Load piped configuration data, if any
fi, err := os.Stdin.Stat()
if err != nil {
log.Fatal(err)
}
if err == nil && fi.Mode()&os.ModeCharDevice == 0 {
confBody, err := ioutil.ReadAll(os.Stdin)
if err != nil {
log.Fatal(err)
}
if len(confBody) > 0 {
return config.Load("stdin", bytes.NewReader(confBody))
}
}
// Caddyfile