aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-03-21 11:28:16 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-11 14:43:57 +0000
commitdf83d361e4fe3c1fc1939b096cb21aa2e7ec3d74 (patch)
tree3f4bb6dba3763a5895135fadecc005eeb0ea96ca /cmd
parentfee9ec18584bcc31ce4889bdbda2fc2a829eaf5f (diff)
downloadpodman-df83d361e4fe3c1fc1939b096cb21aa2e7ec3d74.tar.gz
podman-df83d361e4fe3c1fc1939b096cb21aa2e7ec3d74.tar.bz2
podman-df83d361e4fe3c1fc1939b096cb21aa2e7ec3d74.zip
Major fixes to systemd cgroup handling
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #507 Approved by: baude
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/run.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 5247f536c..79e238da0 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -123,11 +123,13 @@ func runCmd(c *cli.Context) error {
return err
}
- if logrus.GetLevel() == logrus.DebugLevel {
- logrus.Debugf("New container created %q", ctr.ID())
+ logrus.Debugf("New container created %q", ctr.ID())
- p, _ := ctr.CGroupPath()("")
- logrus.Debugf("container %q has CgroupParent %q", ctr.ID(), p)
+ if logrus.GetLevel() == logrus.DebugLevel {
+ cgroupPath, err := ctr.CGroupPath()
+ if err == nil {
+ logrus.Debugf("container %q has CgroupParent %q", ctr.ID(), cgroupPath)
+ }
}
createConfigJSON, err := json.Marshal(createConfig)