diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-25 23:26:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 23:26:52 +0100 |
| commit | 6ba8819d336ed3514b57c5818123ddfac80555ef (patch) | |
| tree | 75f6d959c5fc147d5f8aacc85b1b525517dd8e8c /pkg | |
| parent | b902ad9375eb77ebc75f4d0742764e02250bc5c5 (diff) | |
| parent | 5350254f0578162c226f8990f9835b7920bf9835 (diff) | |
| download | podman-6ba8819d336ed3514b57c5818123ddfac80555ef.tar.gz podman-6ba8819d336ed3514b57c5818123ddfac80555ef.tar.bz2 podman-6ba8819d336ed3514b57c5818123ddfac80555ef.zip | |
Merge pull request #9090 from mheon/sync_shutdown
[NO TESTS NEEDED] Ensure shutdown handler access is syncronized
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/server/server.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 046f6561c..d612041f6 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -179,15 +179,15 @@ func setupSystemd() { func (s *APIServer) Serve() error { setupSystemd() - // Start the shutdown signal handler. - if err := shutdown.Start(); err != nil { - return err - } if err := shutdown.Register("server", func(sig os.Signal) error { return s.Shutdown() }); err != nil { return err } + // Start the shutdown signal handler. + if err := shutdown.Start(); err != nil { + return err + } errChan := make(chan error, 1) |