diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-05 15:23:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 15:23:05 +0200 |
| commit | 626dfdb6131a5f37c2f7cc93dbb98f33d495aca4 (patch) | |
| tree | 1836f259849718606dd0a8af541038d840909dc9 /pkg | |
| parent | e2f38cdaa41ddc711cce40e00dab9c8457d2e830 (diff) | |
| parent | 63eef5a23415380bdc3975c90fc88305a0380a61 (diff) | |
| download | podman-626dfdb6131a5f37c2f7cc93dbb98f33d495aca4.tar.gz podman-626dfdb6131a5f37c2f7cc93dbb98f33d495aca4.tar.bz2 podman-626dfdb6131a5f37c2f7cc93dbb98f33d495aca4.zip | |
Merge pull request #3691 from baude/infoeventlogger
add eventlogger to info
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/client.go | 3 | ||||
| -rw-r--r-- | pkg/varlinkapi/system.go | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/adapter/client.go b/pkg/adapter/client.go index 694d9f961..da6ff5fd0 100644 --- a/pkg/adapter/client.go +++ b/pkg/adapter/client.go @@ -16,7 +16,7 @@ var remoteEndpoint *Endpoint func (r RemoteRuntime) RemoteEndpoint() (remoteEndpoint *Endpoint, err error) { remoteConfigConnections, err := remoteclientconfig.ReadRemoteConfig(r.config) - if errors.Cause(err) != remoteclientconfig.ErrNoConfigationFile { + if err != nil && errors.Cause(err) != remoteclientconfig.ErrNoConfigationFile { return nil, err } // If the user defines an env variable for podman_varlink_bridge @@ -68,7 +68,6 @@ func (r RemoteRuntime) Connect() (*varlink.Connection, error) { if err != nil { return nil, err } - switch ep.Type { case DirectConnection: return varlink.NewConnection(ep.Connection) diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 9b5b3a5b1..2de785b79 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -61,6 +61,7 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error { Kernel: host["kernel"].(string), Os: host["os"].(string), Uptime: host["uptime"].(string), + Eventlogger: host["eventlogger"].(string), } podmanInfo.Host = infoHost store := info[1].Data |