summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-12-11 14:03:21 -0600
committerGitHub <noreply@github.com>2017-12-11 14:03:21 -0600
commitf38e2d0cd29caf3304f4f1efcb5b1d071cb95baf (patch)
tree94a413875065ede3e73bd429425ca62629eba326 /cmd
parentb85d0fa4ea5b6515088a3475a56a44c0cee5bfc5 (diff)
parente64da85ccbd48e619401dd155b79fa4890e2684b (diff)
downloadpodman-f38e2d0cd29caf3304f4f1efcb5b1d071cb95baf.tar.gz
podman-f38e2d0cd29caf3304f4f1efcb5b1d071cb95baf.tar.bz2
podman-f38e2d0cd29caf3304f4f1efcb5b1d071cb95baf.zip
Merge pull request #103 from surajssd/fix-debug-statement
Use debugf to allow parsing of format specifier
Diffstat (limited to 'cmd')
-rw-r--r--cmd/kpod/attach.go2
-rw-r--r--cmd/kpod/ps.go6
-rw-r--r--cmd/kpod/run.go4
-rw-r--r--cmd/kpod/spec.go2
-rw-r--r--cmd/kpod/start.go6
5 files changed, 9 insertions, 11 deletions
diff --git a/cmd/kpod/attach.go b/cmd/kpod/attach.go
index d319ff70d..700023abe 100644
--- a/cmd/kpod/attach.go
+++ b/cmd/kpod/attach.go
@@ -71,7 +71,7 @@ func attachCmd(c *cli.Context) error {
wg.Add(1)
// Attach to the running container
go func() {
- logrus.Debug("trying to attach to the container %s", ctr.ID())
+ logrus.Debugf("trying to attach to the container %s", ctr.ID())
defer wg.Done()
if err := ctr.Attach(c.Bool("no-stdin"), c.String("detach-keys"), attached); err != nil {
logrus.Errorf("unable to attach to container %s: %q", ctr.ID(), err)
diff --git a/cmd/kpod/ps.go b/cmd/kpod/ps.go
index cfcd38dc1..d3b38cbd6 100644
--- a/cmd/kpod/ps.go
+++ b/cmd/kpod/ps.go
@@ -1,6 +1,7 @@
package main
import (
+ "fmt"
"os"
"path/filepath"
"reflect"
@@ -11,15 +12,12 @@ import (
"github.com/docker/go-units"
specs "github.com/opencontainers/runtime-spec/specs-go"
-
- "k8s.io/apimachinery/pkg/fields"
-
- "fmt"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/projectatomic/libpod/libpod"
"github.com/projectatomic/libpod/oci"
"github.com/urfave/cli"
+ "k8s.io/apimachinery/pkg/fields"
)
type psOptions struct {
diff --git a/cmd/kpod/run.go b/cmd/kpod/run.go
index 934096c21..7e078f66a 100644
--- a/cmd/kpod/run.go
+++ b/cmd/kpod/run.go
@@ -100,7 +100,7 @@ func runCmd(c *cli.Context) error {
if err := ctr.Init(); err != nil {
return err
}
- logrus.Debug("container storage created for %q", ctr.ID())
+ logrus.Debugf("container storage created for %q", ctr.ID())
if c.String("cidfile") != "" {
libpod.WriteFile(ctr.ID(), c.String("cidfile"))
@@ -119,7 +119,7 @@ func runCmd(c *cli.Context) error {
wg.Add(1)
// Attach to the running container
go func() {
- logrus.Debug("trying to attach to the container %s", ctr.ID())
+ logrus.Debugf("trying to attach to the container %s", ctr.ID())
defer wg.Done()
if err := ctr.Attach(false, c.String("detach-keys"), attached); err != nil {
logrus.Errorf("unable to attach to container %s: %q", ctr.ID(), err)
diff --git a/cmd/kpod/spec.go b/cmd/kpod/spec.go
index 5d6fe8879..b200ed77a 100644
--- a/cmd/kpod/spec.go
+++ b/cmd/kpod/spec.go
@@ -526,7 +526,7 @@ func (c *createConfig) GetContainerCreateOptions() ([]libpod.CtrCreateOption, er
options = append(options, libpod.WithStdin())
}
if c.name != "" {
- logrus.Debug("appending name %s", c.name)
+ logrus.Debugf("appending name %s", c.name)
options = append(options, libpod.WithName(c.name))
}
diff --git a/cmd/kpod/start.go b/cmd/kpod/start.go
index c874c541c..88dadb1c8 100644
--- a/cmd/kpod/start.go
+++ b/cmd/kpod/start.go
@@ -2,14 +2,14 @@ package main
import (
"fmt"
+ "os"
+ "strconv"
"sync"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/libpod"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
- "os"
- "strconv"
)
var (
@@ -104,7 +104,7 @@ func startCmd(c *cli.Context) error {
wg.Add(1)
// Attach to the running container
go func() {
- logrus.Debug("trying to attach to the container %s", ctr.ID())
+ logrus.Debugf("trying to attach to the container %s", ctr.ID())
defer wg.Done()
if err := ctr.Attach(noStdIn, c.String("detach-keys"), attached); err != nil {
logrus.Errorf("unable to attach to container %s: %q", ctr.ID(), err)