Makefile: run errcheck for all the app/... subdirs

This commit is contained in:
Aliaksandr Valialkin 2022-09-30 18:32:41 +03:00
parent d0b7172316
commit 4d27fa41c8
No known key found for this signature in database
GPG Key ID: A72BEC6CD3D0DED1
3 changed files with 14 additions and 14 deletions

View File

@ -323,15 +323,7 @@ install-golint:
errcheck: install-errcheck errcheck: install-errcheck
errcheck -exclude=errcheck_excludes.txt ./lib/... errcheck -exclude=errcheck_excludes.txt ./lib/...
errcheck -exclude=errcheck_excludes.txt ./app/vminsert/... errcheck -exclude=errcheck_excludes.txt ./app/...
errcheck -exclude=errcheck_excludes.txt ./app/vmselect/...
errcheck -exclude=errcheck_excludes.txt ./app/vmstorage/...
errcheck -exclude=errcheck_excludes.txt ./app/vmagent/...
errcheck -exclude=errcheck_excludes.txt ./app/vmalert/...
errcheck -exclude=errcheck_excludes.txt ./app/vmauth/...
errcheck -exclude=errcheck_excludes.txt ./app/vmbackup/...
errcheck -exclude=errcheck_excludes.txt ./app/vmrestore/...
errcheck -exclude=errcheck_excludes.txt ./app/vmctl/...
install-errcheck: install-errcheck:
which errcheck || go install github.com/kisielk/errcheck@latest which errcheck || go install github.com/kisielk/errcheck@latest

View File

@ -138,7 +138,7 @@ func setUp() {
if err != nil { if err != nil {
return false return false
} }
resp.Body.Close() _ = resp.Body.Close()
return resp.StatusCode == 200 return resp.StatusCode == 200
} }
if err := waitFor(testStorageInitTimeout, readyStorageCheckFunc); err != nil { if err := waitFor(testStorageInitTimeout, readyStorageCheckFunc); err != nil {
@ -337,7 +337,9 @@ func tcpWrite(t *testing.T, address string, data string) {
s := newSuite(t) s := newSuite(t)
conn, err := net.Dial("tcp", address) conn, err := net.Dial("tcp", address)
s.noError(err) s.noError(err)
defer conn.Close() defer func() {
_ = conn.Close()
}()
n, err := conn.Write([]byte(data)) n, err := conn.Write([]byte(data))
s.noError(err) s.noError(err)
s.equalInt(n, len(data)) s.equalInt(n, len(data))
@ -348,7 +350,9 @@ func httpReadMetrics(t *testing.T, address, query string) []Metric {
s := newSuite(t) s := newSuite(t)
resp, err := http.Get(address + query) resp, err := http.Get(address + query)
s.noError(err) s.noError(err)
defer resp.Body.Close() defer func() {
_ = resp.Body.Close()
}()
s.equalInt(resp.StatusCode, 200) s.equalInt(resp.StatusCode, 200)
var rows []Metric var rows []Metric
for dec := json.NewDecoder(resp.Body); dec.More(); { for dec := json.NewDecoder(resp.Body); dec.More(); {
@ -363,7 +367,9 @@ func httpReadStruct(t *testing.T, address, query string, dst interface{}) {
s := newSuite(t) s := newSuite(t)
resp, err := http.Get(address + query) resp, err := http.Get(address + query)
s.noError(err) s.noError(err)
defer resp.Body.Close() defer func() {
_ = resp.Body.Close()
}()
s.equalInt(resp.StatusCode, 200) s.equalInt(resp.StatusCode, 200)
s.noError(json.NewDecoder(resp.Body).Decode(dst)) s.noError(json.NewDecoder(resp.Body).Decode(dst))
} }

View File

@ -85,7 +85,9 @@ func selfScraper(scrapeInterval time.Duration) {
mr.Timestamp = currentTimestamp mr.Timestamp = currentTimestamp
mr.Value = r.Value mr.Value = r.Value
} }
vmstorage.AddRows(mrs) if err := vmstorage.AddRows(mrs); err != nil {
logger.Errorf("cannot store self-scraped metrics: %s", err)
}
} }
} }