Commit fc7f7dff authored by Matthew Holt's avatar Matthew Holt

Prevent panic in case of hung loading sequence (fixes #315)

This is known to happen if another program spawns Caddy with a stdin pipe but does not close its write end of Caddy's stdin.
parent 47c5b6c9
......@@ -22,6 +22,12 @@ func init() {
var updatedCaddyfile Input
caddyfileMu.Lock()
if caddyfile == nil {
// Hmm, did spawing process forget to close stdin? Anyhow, this is unusual.
log.Println("[ERROR] SIGUSR1: no caddyfile to reload")
caddyfileMu.Unlock()
continue
}
if caddyfile.IsFile() {
body, err := ioutil.ReadFile(caddyfile.Path())
if err == nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment