serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-03 17:43:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid deadlock (fixes #941)

Browse source
This commit is contained in:
Matthew Holt 2016-07-19 12:05:40 -06:00
parent b35d19d78e
commit 1240690973
No known key found for this signature in database
GPG key ID: 0D97CC73664F4D03
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
caddy.go
View file

@ -696,14 +696,19 @@ func loadServerBlocks(serverType, filename string, input io.Reader) ([]caddyfile
// instances after stopping is completed. Do not re-use any // instances after stopping is completed. Do not re-use any
// references to old instances after calling Stop. // references to old instances after calling Stop.
func Stop() error { func Stop() error {
// This awkward for loop is to avoid a deadlock since
// inst.Stop() also acquires the instancesMu lock.
for {
instancesMu.Lock() instancesMu.Lock()
for _, inst := range instances { if len(instances) == 0 {
break
}
inst := instances[0]
instancesMu.Unlock()
if err := inst.Stop(); err != nil { if err := inst.Stop(); err != nil {
log.Printf("[ERROR] Stopping %s: %v", inst.serverType, err) log.Printf("[ERROR] Stopping %s: %v", inst.serverType, err)
} }
} }
instances = []*Instance{}
instancesMu.Unlock()
return nil return nil
} }