From 66cae3209ec362cc6fb663dec742cf0514aa9af8 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 20 May 2020 18:19:06 -0400 Subject: Fix build on OS X We disabled the OS X and Windows cross-building tests. This, predictably, led us to regress a bit in our ability to build for both of these. This fixes the build on OS X and fixes one obvious Windows bug. Unfortunately, we're dragging in all of `pkg/spec` somewhere on Windows, and things are blowing up spectacularly because of it (plus a few uses of the `syscall` package in the bindings). I've giving up for the day. This fixes OS X, but does not fully enable the cross-build CI (need Windows fixes for that). Signed-off-by: Matthew Heon --- cmd/podman/syslog_linux.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 cmd/podman/syslog_linux.go (limited to 'cmd/podman/syslog_linux.go') diff --git a/cmd/podman/syslog_linux.go b/cmd/podman/syslog_linux.go new file mode 100644 index 000000000..ac7bbfe0f --- /dev/null +++ b/cmd/podman/syslog_linux.go @@ -0,0 +1,25 @@ +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) + } +} -- cgit v1.2.3-54-g00ecf