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

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

Browse source 
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.
This commit is contained in:
Matthew Holt 2015-11-05 13:29:37 -07:00
parent 47c5b6c9c4
commit fc7f7dffa8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
caddy/sigtrap_posix.go
View file

@ -22,6 +22,12 @@ func init() {
var updatedCaddyfile Input var updatedCaddyfile Input
caddyfileMu.Lock() 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() { if caddyfile.IsFile() {
body, err := ioutil.ReadFile(caddyfile.Path()) body, err := ioutil.ReadFile(caddyfile.Path())
if err == nil { if err == nil {