opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enforce LIFO ordering for shutdown handlers

Browse Source 
This allows us to run both the Libpod and Server handlers at the
same time without unregistering one.

Also, pass the signal that killed us into the handlers, in case
they want to use it to determine what to do (e.g. what exit code
to set).

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2020-10-13 14:00:35 -04:00
parent 83e6e4ccdd
commit f58d2f5e75
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/server/server.go
View File

@ -185,14 +185,11 @@ func (s *APIServer) Serve() error {
if err := shutdown.Start(); err != nil {
return err
}
if err := shutdown.Register("server", func() error {
if err := shutdown.Register("server", func(sig os.Signal) error {
return s.Shutdown()
}); err != nil {
return err
}
// Unregister the libpod handler, which just calls exit(1).
// Ignore errors if it doesn't exist.
_ = shutdown.Unregister("libpod")
errChan := make(chan error, 1)