diff options
| author | baude <bbaude@redhat.com> | 2019-07-11 05:44:12 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-07-21 14:22:39 -0500 |
| commit | db826d5d75630cca784bd7092eba5b06601ae27f (patch) | |
| tree | c60cc844e499d5d57752fdb92d4036ea0487ae3c /libpod/runtime_pod_linux.go | |
| parent | a5aa44c583612e210cf2ba44c3313a2ff27c94da (diff) | |
| download | podman-db826d5d75630cca784bd7092eba5b06601ae27f.tar.gz podman-db826d5d75630cca784bd7092eba5b06601ae27f.tar.bz2 podman-db826d5d75630cca784bd7092eba5b06601ae27f.zip | |
golangci-lint round #3
this is the third round of preparing to use the golangci-lint on our
code base.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/runtime_pod_linux.go')
| -rw-r--r-- | libpod/runtime_pod_linux.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index d667d3a25..f38e6e7c1 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -201,11 +201,7 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool) conmonCgroupPath := filepath.Join(p.state.CgroupPath, "conmon") conmonCgroup, err := cgroups.Load(conmonCgroupPath) if err != nil && err != cgroups.ErrCgroupDeleted { - if removalErr == nil { - removalErr = errors.Wrapf(err, "error retrieving pod %s conmon cgroup %s", p.ID(), conmonCgroupPath) - } else { - logrus.Errorf("Error retrieving pod %s conmon cgroup %s: %v", p.ID(), conmonCgroupPath, err) - } + removalErr = errors.Wrapf(err, "error retrieving pod %s conmon cgroup %s", p.ID(), conmonCgroupPath) } // New resource limits |