From 719de8f0e1508b7d1a2bb392464d296a08631064 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Sat, 27 Feb 2021 20:39:46 -0500 Subject: [PATCH] util/systemd: explicitly check for os.ErrNotExist from sdnotify Signed-off-by: Matt Layher --- util/systemd/systemd_linux.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/util/systemd/systemd_linux.go b/util/systemd/systemd_linux.go index f33c35730..86ac65441 100644 --- a/util/systemd/systemd_linux.go +++ b/util/systemd/systemd_linux.go @@ -7,6 +7,7 @@ package systemd import ( + "errors" "log" "os" "sync" @@ -36,14 +37,10 @@ var ( func notifier() *sdnotify.Notifier { getNotifyOnce.Do(func() { - sock := os.Getenv(sdnotify.Socket) - if sock == "" { - // Not running under systemd probably. Bail out before logging. - return - } var err error - getNotifyOnce.v, err = sdnotify.Open(sock) - if err != nil { + getNotifyOnce.v, err = sdnotify.New() + // Not exist means probably not running under systemd, so don't log. + if err != nil && !errors.Is(err, os.ErrNotExist) { log.Printf("systemd: systemd-notifier error: %v", err) } })