diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-09 14:55:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 14:55:45 +0200 |
| commit | 555b30e9ebdf82dfc2e0c7ddd9f0f8b51ccb4a39 (patch) | |
| tree | e56d6b21c07df5e3a442ed423a6d6cba8d22247f /cmd/podman/service.go | |
| parent | 655139fdda20819160b2baad840429a80d6285e5 (diff) | |
| parent | e0847f5457edfdeb17dad259f1cd06b1d4cec93e (diff) | |
| download | podman-555b30e9ebdf82dfc2e0c7ddd9f0f8b51ccb4a39.tar.gz podman-555b30e9ebdf82dfc2e0c7ddd9f0f8b51ccb4a39.tar.bz2 podman-555b30e9ebdf82dfc2e0c7ddd9f0f8b51ccb4a39.zip | |
Merge pull request #5634 from jwhonce/wip/service
V2 podman system service
Diffstat (limited to 'cmd/podman/service.go')
| -rw-r--r-- | cmd/podman/service.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/service.go b/cmd/podman/service.go index bcb37eac5..41ec499a1 100644 --- a/cmd/podman/service.go +++ b/cmd/podman/service.go @@ -91,7 +91,7 @@ func resolveApiURI(c *cliconfig.ServiceValues) (string, error) { if len(c.InputArgs) > 0 { apiURI = c.InputArgs[0] - } else if ok := systemd.SocketActivated(); ok { + } else if ok := systemd.SocketActivated(); ok { // nolint: gocritic apiURI = "" } else if rootless.IsRootless() { xdg, err := util.GetRuntimeDir() @@ -161,7 +161,7 @@ func runREST(r *libpod.Runtime, uri string, timeout time.Duration) error { } func runVarlink(r *libpod.Runtime, uri string, timeout time.Duration, c *cliconfig.ServiceValues) error { - var varlinkInterfaces = []*iopodman.VarlinkInterface{varlinkapi.New(&c.PodmanCommand, r)} + var varlinkInterfaces = []*iopodman.VarlinkInterface{varlinkapi.New(c.PodmanCommand.Command, r)} service, err := varlink.NewService( "Atomic", "podman", @@ -182,7 +182,7 @@ func runVarlink(r *libpod.Runtime, uri string, timeout time.Duration, c *cliconf if err = service.Listen(uri, timeout); err != nil { switch err.(type) { case varlink.ServiceTimeoutError: - logrus.Infof("varlink service expired (use --timeout to increase session time beyond %d ms, 0 means never timeout)", timeout.String()) + logrus.Infof("varlink service expired (use --timeout to increase session time beyond %s ms, 0 means never timeout)", timeout.String()) return nil default: return errors.Wrapf(err, "unable to start varlink service") |