github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4213 from fahedouch/remove_unnecessary_condition

Browse Source 
remove if condition because it is handled by the sdNotify daemon func
This commit is contained in:
Phil Estes 2020-04-27 10:57:56 -04:00 committed by GitHub
commit 3f95bc5f18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/containerd/command/notify_linux.go
View File

@ -20,7 +20,6 @@ package command
import (
"context"
"os"
sd "github.com/coreos/go-systemd/v22/daemon"
@ -38,7 +37,6 @@ func notifyStopping(ctx context.Context) error {
}
func sdNotify(ctx context.Context, state string) error {
if os.Getenv("NOTIFY_SOCKET") != "" {
notified, err := sd.SdNotify(false, state)
log.G(ctx).
WithError(err).
@ -47,6 +45,3 @@ func sdNotify(ctx context.Context, state string) error {
Debug("sd notification")
return err
}
return nil
}