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

Fix for stdin on Windows

Browse source
This commit is contained in:
Matthew Holt 2015-05-06 09:16:10 -06:00
parent 63ccc626f9
commit 898896f9e0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main.go
View file

@ -104,12 +104,13 @@ func loadConfigs() ([]server.Config, error) {
} }
// stdin // stdin
// Load piped configuration data, if any
fi, err := os.Stdin.Stat() fi, err := os.Stdin.Stat()
if err != nil {
log.Fatal(err)
}
if err == nil && fi.Mode()&os.ModeCharDevice == 0 { if err == nil && fi.Mode()&os.ModeCharDevice == 0 {
// Note that a non-nil error is not a problem. Windows
// will not create a stdin if there is no pipe, which
// produces an error when calling Stat(). But Unix will
// make one either way, which is why we also check that
// bitmask.
confBody, err := ioutil.ReadAll(os.Stdin) confBody, err := ioutil.ReadAll(os.Stdin)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@ -128,6 +129,7 @@ func loadConfigs() ([]server.Config, error) {
return []server.Config{}, err return []server.Config{}, err
} }
defer file.Close() defer file.Close()
return config.Load(config.DefaultConfigFile, file) return config.Load(config.DefaultConfigFile, file)
} }
@ -143,7 +145,7 @@ func arrangeBindings(allConfigs []server.Config) (map[string][]server.Config, er
for _, conf := range allConfigs { for _, conf := range allConfigs {
addr, err := net.ResolveTCPAddr("tcp", conf.Address()) addr, err := net.ResolveTCPAddr("tcp", conf.Address())
if err != nil { if err != nil {
return addresses, err return addresses, errors.New("Could not serve " + conf.Address() + " - " + err.Error())
} }
addresses[addr.String()] = append(addresses[addr.String()], conf) addresses[addr.String()] = append(addresses[addr.String()], conf)
} }