Improve error handling for HTTP client

2 files changed, 13 insertions, 1 deletions

diff --git a/reader/feed/handler.go b/reader/feed/handler.go
index cc71256..d6ac84e 100644
--- a/reader/feed/handler.go
+++ b/reader/feed/handler.go
@@ -44,6 +44,9 @@ func (h *Handler) CreateFeed(userID, categoryID int64, url string, crawler bool)
 	client := http.NewClient(url)
 	response, err := client.Get()
 	if err != nil {
+		if _, ok := err.(errors.LocalizedError); ok {
+			return nil, err
+		}
 		return nil, errors.NewLocalizedError(errRequestFailed, err)
 	}
 
@@ -120,7 +123,13 @@ func (h *Handler) RefreshFeed(userID, feedID int64) error {
 	client := http.NewClientWithCacheHeaders(originalFeed.FeedURL, originalFeed.EtagHeader, originalFeed.LastModifiedHeader)
 	response, err := client.Get()
 	if err != nil {
-		customErr := errors.NewLocalizedError(errRequestFailed, err)
+		var customErr errors.LocalizedError
+		if lerr, ok := err.(errors.LocalizedError); ok {
+			customErr = lerr
+		} else {
+			customErr = errors.NewLocalizedError(errRequestFailed, err)
+		}
+
 		originalFeed.ParsingErrorCount++
 		originalFeed.ParsingErrorMsg = customErr.Error()
 		h.store.UpdateFeed(originalFeed)
diff --git a/reader/subscription/finder.go b/reader/subscription/finder.go
index 8e361b7..4e2879a 100644
--- a/reader/subscription/finder.go
+++ b/reader/subscription/finder.go
@@ -33,6 +33,9 @@ func FindSubscriptions(websiteURL string) (Subscriptions, error) {
 	client := http.NewClient(websiteURL)
 	response, err := client.Get()
 	if err != nil {
+		if _, ok := err.(errors.LocalizedError); ok {
+			return nil, err
+		}
 		return nil, errors.NewLocalizedError(errConnectionFailure, err)
 	}