arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up error and changing close to defer close

Browse Source
This commit is contained in:
Jean Michel MacKay 2018-09-07 10:47:11 -04:00
parent 49cbdd7a7c
commit 3959f416fa
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/vulnmdsrc/nvd/nvd.go
View File

@ -171,7 +171,7 @@ func getDataFeeds(dataFeedHashes map[string]string, localPath string) (map[strin
log.WithError(err).WithField(logDataFeedName, dataFeedName).Error("could not download NVD data feed") log.WithError(err).WithField(logDataFeedName, dataFeedName).Error("could not download NVD data feed")
return dataFeedReaders, dataFeedHashes, commonerr.ErrCouldNotDownload return dataFeedReaders, dataFeedHashes, commonerr.ErrCouldNotDownload
} }
// r is closed in BuildCache() defer r.Body.Close()
if !httputil.Status2xx(r) { if !httputil.Status2xx(r) {
log.WithField("StatusCode", r.StatusCode).Error("Failed to download NVD data feed") log.WithField("StatusCode", r.StatusCode).Error("Failed to download NVD data feed")
@ -196,8 +196,6 @@ func getDataFeeds(dataFeedHashes map[string]string, localPath string) (map[strin
} else { } else {
log.WithError(err).Warning("could not store NVD data feed to filesystem") log.WithError(err).Warning("could not store NVD data feed to filesystem")
} }
r.Body.Close()
} }
} }
@ -212,7 +210,7 @@ func getHashFromMetaURL(metaURL string) (string, error) {
defer r.Body.Close() defer r.Body.Close()
if !httputil.Status2xx(r) { if !httputil.Status2xx(r) {
return "", errors.New("Unsuccesuful status code: " + string(r.StatusCode)) return "", errors.New(metaURL + " failed status code: " + string(r.StatusCode))
} }
scanner := bufio.NewScanner(r.Body) scanner := bufio.NewScanner(r.Body)