github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-02 06:02:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddy: Run OnShutdown callbacks before instance Stop() calls (#2320)

Browse Source 
- see https://github.com/coredns/coredns/issues/1666#issuecomment-380624422
This commit is contained in:
Ruslan Drozhdzh 2018-10-30 03:25:36 +03:00 committed by Matt Holt
parent 86060ef9b4
commit 3ce3f3a96a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
caddy.go
View File

@ -248,16 +248,16 @@ func (i *Instance) Restart(newCaddyfile Input) (*Instance, error) {
} }
// success! stop the old instance // success! stop the old instance
err = i.Stop()
if err != nil {
return i, err
}
for _, shutdownFunc := range i.onShutdown { for _, shutdownFunc := range i.onShutdown {
err = shutdownFunc() err = shutdownFunc()
if err != nil { if err != nil {
return i, err return i, err
} }
} }
err = i.Stop()
if err != nil {
return i, err
}
// Execute instantiation events // Execute instantiation events
EmitEvent(InstanceStartupEvent, newInst) EmitEvent(InstanceStartupEvent, newInst)