From 61fc1870ad230243cf7a8c9f251e6d52ec32cc31 Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Thu, 25 Aug 2022 18:08:07 +0100 Subject: cmd/podman: Enable --syslog on FreeBSD [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson --- cmd/podman/syslog_common.go | 28 ++++++++++++++++++++++++++++ cmd/podman/syslog_linux.go | 25 ------------------------- cmd/podman/syslog_unsupported.go | 4 ++-- 3 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 cmd/podman/syslog_common.go delete mode 100644 cmd/podman/syslog_linux.go diff --git a/cmd/podman/syslog_common.go b/cmd/podman/syslog_common.go new file mode 100644 index 000000000..e035e6365 --- /dev/null +++ b/cmd/podman/syslog_common.go @@ -0,0 +1,28 @@ +//go:build linux || freebsd +// +build linux freebsd + +package main + +import ( + "fmt" + "log/syslog" + "os" + + "github.com/sirupsen/logrus" + logrusSyslog "github.com/sirupsen/logrus/hooks/syslog" +) + +func syslogHook() { + if !useSyslog { + return + } + + hook, err := logrusSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "") + if err != nil { + fmt.Fprint(os.Stderr, "Failed to initialize syslog hook: "+err.Error()) + os.Exit(1) + } + if err == nil { + logrus.AddHook(hook) + } +} diff --git a/cmd/podman/syslog_linux.go b/cmd/podman/syslog_linux.go deleted file mode 100644 index ac7bbfe0f..000000000 --- a/cmd/podman/syslog_linux.go +++ /dev/null @@ -1,25 +0,0 @@ -package main - -import ( - "fmt" - "log/syslog" - "os" - - "github.com/sirupsen/logrus" - logrusSyslog "github.com/sirupsen/logrus/hooks/syslog" -) - -func syslogHook() { - if !useSyslog { - return - } - - hook, err := logrusSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "") - if err != nil { - fmt.Fprint(os.Stderr, "Failed to initialize syslog hook: "+err.Error()) - os.Exit(1) - } - if err == nil { - logrus.AddHook(hook) - } -} diff --git a/cmd/podman/syslog_unsupported.go b/cmd/podman/syslog_unsupported.go index 42a7851ab..365e5b2b4 100644 --- a/cmd/podman/syslog_unsupported.go +++ b/cmd/podman/syslog_unsupported.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !linux && !freebsd +// +build !linux,!freebsd package main -- cgit v1.2.3-54-g00ecf