From 855b48f0c941902a02628e261c925b4ffe7a6a8a Mon Sep 17 00:00:00 2001
From: kota kanbe <kotakanbe@gmail.com>
Date: Thu, 7 Apr 2016 02:59:44 +0900
Subject: [PATCH] Fix error handling in HTTP backoff function
---
cveapi/cve_client.go | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/cveapi/cve_client.go b/cveapi/cve_client.go
index 728359d401..c4c1641fb8 100644
--- a/cveapi/cve_client.go
+++ b/cveapi/cve_client.go
@@ -127,19 +127,18 @@ func (api cvedictClient) FetchCveDetails(cveIDs []string) (cveDetails cve.CveDet
}
func (api cvedictClient) httpGet(key, url string, resChan chan<- response, errChan chan<- error) {
-
var body string
var errs []error
var resp *http.Response
f := func() (err error) {
resp, body, errs = gorequest.New().SetDebug(config.Conf.Debug).Get(url).End()
if len(errs) > 0 || resp.StatusCode != 200 {
- errChan <- fmt.Errorf("HTTP error. errs: %v, url: %s", errs, url)
+ return fmt.Errorf("HTTP GET error: %v, code: %d, url: %s", errs, resp.StatusCode, url)
}
return nil
}
notify := func(err error, t time.Duration) {
- log.Warnf("Failed to get. retrying in %s seconds. err: %s", t, err)
+ log.Warnf("Failed to HTTP GET. retrying in %s seconds. err: %s", t, err)
}
err := backoff.RetryNotify(f, backoff.NewExponentialBackOff(), notify)
if err != nil {
@@ -219,12 +218,12 @@ func (api cvedictClient) httpPost(key, url string, query map[string]string) ([]c
}
resp, body, errs = req.End()
if len(errs) > 0 || resp.StatusCode != 200 {
- return fmt.Errorf("HTTP error. errs: %v, url: %s", errs, url)
+ return fmt.Errorf("HTTP POST errors: %v, code: %d, url: %s", errs, resp.StatusCode, url)
}
return nil
}
notify := func(err error, t time.Duration) {
- log.Warnf("Failed to get. retrying in %s seconds. err: %s", t, err)
+ log.Warnf("Failed to HTTP POST. retrying in %s seconds. err: %s", t, err)
}
err := backoff.RetryNotify(f, backoff.NewExponentialBackOff(), notify)
if err != nil {