From 2faa24abbf04b5f5bef07cd6ef9ede13c3edbe01 Mon Sep 17 00:00:00 2001 From: hanchao Date: Mon, 28 Aug 2023 19:26:53 +0800 Subject: [PATCH] rubik: clean code for services --- pkg/common/perf/perf.go | 7 ++----- pkg/common/util/file.go | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkg/common/perf/perf.go b/pkg/common/perf/perf.go index 68fe6e3..691abc7 100644 --- a/pkg/common/perf/perf.go +++ b/pkg/common/perf/perf.go @@ -256,15 +256,12 @@ func (p *perf) Destroy() { // CgroupStat report perf stat for cgroup func CgroupStat(cgpath string, dur time.Duration) (*Stat, error) { p, err := newPerf(cgpath) - defer func() { - if p != nil { - p.Destroy() - } - }() if err != nil { return nil, errors.Errorf("perf init failed: %v", err) } + defer p.Destroy() + if err := p.Start(); err != nil { return nil, errors.Errorf("perf start failed: %v", err) } diff --git a/pkg/common/util/file.go b/pkg/common/util/file.go index 5a67b72..08e9acd 100644 --- a/pkg/common/util/file.go +++ b/pkg/common/util/file.go @@ -140,14 +140,12 @@ func AppendFile(path, content string) error { return fmt.Errorf("%v is not a file", path) } f, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, constant.DefaultFileMode) - defer func() { - if err != f.Close() { - return - } - }() if err != nil { return fmt.Errorf("error opening file: %v", err) } + + defer f.Close() + if _, err := f.WriteString(content); err != nil { return fmt.Errorf("error writing file: %v", err) } -- Gitee