diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-29 17:30:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 17:30:41 -0500 |
| commit | 745fa4ac94c3ec99becd85f59d1b59c2c9765527 (patch) | |
| tree | 63f32aeeb816a637e9406217a4044ff91031cd31 /pkg/api | |
| parent | b6336071101fe4f19a7826d16f0dd61394678853 (diff) | |
| parent | c1f05be4d7ac31c741a9ea542e284d731c6544a1 (diff) | |
| download | podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.tar.gz podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.tar.bz2 podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.zip | |
Merge pull request #9163 from mheon/backports_rc2
Backports for v3.0 RC2
Diffstat (limited to 'pkg/api')
| -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) |