From 4878dff3e2c89382699c29c10dc5036367275575 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 5 Oct 2020 12:33:53 -0700 Subject: Remove excessive error wrapping In case os.Open[File], os.Mkdir[All], ioutil.ReadFile and the like fails, the error message already contains the file name and the operation that fails, so there is no need to wrap the error with something like "open %s failed". While at it - replace a few places with os.Open, ioutil.ReadAll with ioutil.ReadFile. - replace errors.Wrapf with errors.Wrap for cases where there are no %-style arguments. Signed-off-by: Kir Kolyshkin --- utils/utils_supported.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/utils_supported.go') diff --git a/utils/utils_supported.go b/utils/utils_supported.go index 885112efb..bcaa2c61a 100644 --- a/utils/utils_supported.go +++ b/utils/utils_supported.go @@ -56,7 +56,7 @@ func RunUnderSystemdScope(pid int, slice string, unitName string) error { func getCgroupProcess(procFile string) (string, error) { f, err := os.Open(procFile) if err != nil { - return "", errors.Wrapf(err, "open file %q", procFile) + return "", err } defer f.Close() @@ -104,7 +104,7 @@ func MoveUnderCgroupSubtree(subtree string) error { procFile := "/proc/self/cgroup" f, err := os.Open(procFile) if err != nil { - return errors.Wrapf(err, "open file %q", procFile) + return err } defer f.Close() -- cgit v1.2.3-54-g00ecf