diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-22 13:30:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 13:30:09 -0400 |
| commit | bec7e8a6456de2853e5a5f733d144dffc9885073 (patch) | |
| tree | c499cea552e8bd4d0b39c6b3ad5fc108159ee7db | |
| parent | 509407cac87206759d3a20cb636071de31651aa5 (diff) | |
| parent | 8ffeb626c918b9b9329a8bda5e5579169e323bdf (diff) | |
| download | podman-bec7e8a6456de2853e5a5f733d144dffc9885073.tar.gz podman-bec7e8a6456de2853e5a5f733d144dffc9885073.tar.bz2 podman-bec7e8a6456de2853e5a5f733d144dffc9885073.zip | |
Merge pull request #15381 from dfr/freebsd-enable
Enable event logging, tunnel and ABI mode for FreeBSD
| -rw-r--r-- | cmd/podman/registry/config.go | 2 | ||||
| -rw-r--r-- | libpod/events/events_freebsd.go | 23 | ||||
| -rw-r--r-- | libpod/events/events_unsupported.go | 4 | ||||
| -rw-r--r-- | libpod/events/logfile.go | 4 |
4 files changed, 28 insertions, 5 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index cae618b44..a118fdc4d 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -61,7 +61,7 @@ func newPodmanConfig() { switch runtime.GOOS { case "darwin", "windows": mode = entities.TunnelMode - case "linux": + case "linux", "freebsd": // Some linux clients might only be compiled without ABI // support (e.g., podman-remote). if abiSupport && !IsRemote() { diff --git a/libpod/events/events_freebsd.go b/libpod/events/events_freebsd.go new file mode 100644 index 000000000..17d410089 --- /dev/null +++ b/libpod/events/events_freebsd.go @@ -0,0 +1,23 @@ +package events + +import ( + "fmt" + "strings" + + "github.com/sirupsen/logrus" +) + +// NewEventer creates an eventer based on the eventer type +func NewEventer(options EventerOptions) (Eventer, error) { + logrus.Debugf("Initializing event backend %s", options.EventerType) + switch strings.ToUpper(options.EventerType) { + case strings.ToUpper(LogFile.String()): + return EventLogFile{options}, nil + case strings.ToUpper(Null.String()): + return NewNullEventer(), nil + case strings.ToUpper(Memory.String()): + return NewMemoryEventer(), nil + default: + return nil, fmt.Errorf("unknown event logger type: %s", strings.ToUpper(options.EventerType)) + } +} diff --git a/libpod/events/events_unsupported.go b/libpod/events/events_unsupported.go index d766402a9..01031c225 100644 --- a/libpod/events/events_unsupported.go +++ b/libpod/events/events_unsupported.go @@ -1,5 +1,5 @@ -//go:build !linux -// +build !linux +//go:build !linux && !freebsd +// +build !linux,!freebsd package events diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index c7dbf4850..519e16629 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -1,5 +1,5 @@ -//go:build linux -// +build linux +//go:build linux || freebsd +// +build linux freebsd package events |