diff options
author | Matthew Heon <matthew.heon@pm.me> | 2020-05-20 18:19:06 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2020-05-20 18:24:56 -0400 |
commit | 66cae3209ec362cc6fb663dec742cf0514aa9af8 (patch) | |
tree | 4f0bfde574c55d26eef141792faeab8171ff093d /cmd/podman/root.go | |
parent | e8e5a5f96e0b5d915baeeb0915cc0ca788b70e64 (diff) | |
download | podman-66cae3209ec362cc6fb663dec742cf0514aa9af8.tar.gz podman-66cae3209ec362cc6fb663dec742cf0514aa9af8.tar.bz2 podman-66cae3209ec362cc6fb663dec742cf0514aa9af8.zip |
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 <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/root.go')
-rw-r--r-- | cmd/podman/root.go | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 7d6f6f823..dffd9b534 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "log/syslog" "os" "path" "runtime/pprof" @@ -17,7 +16,6 @@ import ( "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" - logrusSyslog "github.com/sirupsen/logrus/hooks/syslog" "github.com/spf13/cobra" "github.com/spf13/pflag" ) @@ -191,21 +189,6 @@ func loggingHook() { } } -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) - } -} - func rootFlags(opts *entities.PodmanConfig, flags *pflag.FlagSet) { // V2 flags flags.StringVarP(&opts.Uri, "remote", "r", registry.DefaultAPIAddress(), "URL to access Podman service") |