summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-07 11:46:48 -0500
committerGitHub <noreply@github.com>2020-12-07 11:46:48 -0500
commitef6748dc87126765cc97b6901d0f5adf297914d4 (patch)
treea9e268a307b853a9988da2515723b14e62d00ead
parentaac03d4a329580634c4c086352b1e0c4023937f4 (diff)
parentbd2cfe0a9336b01122de851c528ad7f3e521af78 (diff)
downloadpodman-ef6748dc87126765cc97b6901d0f5adf297914d4.tar.gz
podman-ef6748dc87126765cc97b6901d0f5adf297914d4.tar.bz2
podman-ef6748dc87126765cc97b6901d0f5adf297914d4.zip
Merge pull request #8629 from mheon/no_error_on_dupe_handler
Do not error on installing duplicate shutdown handler
-rw-r--r--libpod/runtime.go2
-rw-r--r--libpod/shutdown/handler.go6
2 files changed, 6 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 72bd34a5e..1004e4fa7 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -190,7 +190,7 @@ func newRuntimeFromConfig(ctx context.Context, conf *config.Config, options ...R
if err := shutdown.Register("libpod", func(sig os.Signal) error {
os.Exit(1)
return nil
- }); err != nil {
+ }); err != nil && errors.Cause(err) != shutdown.ErrHandlerExists {
logrus.Errorf("Error registering shutdown handler for libpod: %v", err)
}
diff --git a/libpod/shutdown/handler.go b/libpod/shutdown/handler.go
index 87538dec9..f0f228b19 100644
--- a/libpod/shutdown/handler.go
+++ b/libpod/shutdown/handler.go
@@ -11,6 +11,10 @@ import (
)
var (
+ ErrHandlerExists error = errors.New("handler with given name already exists")
+)
+
+var (
stopped bool
sigChan chan os.Signal
cancelChan chan bool
@@ -98,7 +102,7 @@ func Register(name string, handler func(os.Signal) error) error {
}
if _, ok := handlers[name]; ok {
- return errors.Errorf("handler with name %s already exists", name)
+ return ErrHandlerExists
}
handlers[name] = handler