TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/systemd: explicitly check for os.ErrNotExist from sdnotify

Browse Source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2021-02-27 20:39:46 -05:00 committed by Brad Fitzpatrick
parent 2d5db90161
commit 719de8f0e1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/systemd/systemd_linux.go
View File

@ -7,6 +7,7 @@
package systemd package systemd
import ( import (
"errors"
"log" "log"
"os" "os"
"sync" "sync"
@ -36,14 +37,10 @@ func (l *logOnce) logf(format string, args ...interface{}) {
func notifier() *sdnotify.Notifier { func notifier() *sdnotify.Notifier {
getNotifyOnce.Do(func() { getNotifyOnce.Do(func() {
sock := os.Getenv(sdnotify.Socket)
if sock == "" {
// Not running under systemd probably. Bail out before logging.
return
}
var err error var err error
getNotifyOnce.v, err = sdnotify.Open(sock) getNotifyOnce.v, err = sdnotify.New()
if err != nil { // 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) log.Printf("systemd: systemd-notifier error: %v", err)
} }
}) })