Never exit due to HTTP request error (#37)

This change removes special handling of collection errors and thus
eliminating exits due to those.
In case of any error due to collection we log the details and move on to
the next available organization.

Closes #36

Author: Bjørn

main.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io"
 	"net/http"
-	"net/url"
 	"os"
 	"os/signal"
 	"strconv"
@@ -146,18 +144,13 @@ func runAPIPolling(done chan error, url, token string, organizationIDs []string,
 		var gaugeResults []gaugeResult
 		for _, organization := range organizations {
 			log.Debugf("Collecting for organization '%s'", organization.Name)
-			var results []gaugeResult
-			err := poll(organization, func(organization org) error {
-				var err error
-				results, err = collect(&client, organization)
-				if err != nil {
-					return err
-				}
-				return nil
-			})
+			results, err := collect(&client, organization)
 			if err != nil {
-				done <- errors.WithMessagef(err, "organization %s (%s)", organization.Name, organization.ID)
-				return
+				log.With("error", errors.Cause(err)).
+					With("organzationName", organization.Name).
+					With("organzationId", organization.ID).
+					Errorf("Collection failed for organization '%s': %v", organization.Name, err)
+				continue
 			}
 			gaugeResults = append(gaugeResults, results...)
 		}
@@ -171,32 +164,6 @@ func runAPIPolling(done chan error, url, token string, organizationIDs []string,
 	}
 }
 
-// poll polles the collector for new data. In case of errors it decides whether
-// to keep on polling or stop b y returning an error.
-func poll(organization org, collector func(org) error) error {
-	err := collector(organization)
-	if err != nil {
-		err = errors.Cause(err)
-		httpErr, ok := err.(*url.Error)
-		if ok {
-			if httpErr.Timeout() {
-				log.Errorf("Collection failed for organization '%s' due timeout", organization.Name)
-				return nil
-			}
-			if httpErr.Err == io.ErrUnexpectedEOF {
-				log.Errorf("Collection failed for organization '%s' due to unexpected EOF", organization.Name)
-				return nil
-			}
-		}
-		if err == io.ErrUnexpectedEOF {
-			log.Errorf("Collection failed for organization '%s' due to unexpected EOF", organization.Name)
-			return nil
-		}
-		return err
-	}
-	return nil
-}
-
 func organizationNames(orgs []org) []string {
 	var names []string
 	for _, org := range orgs {

main_test.go

@@ -1,11 +1,8 @@
 package main
 
 import (
-	"errors"
-	"io"
 	"net/http"
 	"net/http/httptest"
-	"net/url"
 	"reflect"
 	"sort"
 	"testing"
@@ -184,77 +181,3 @@ func TestRunAPIPolling_issuesTimeout(t *testing.T) {
 		// success path if timeout errors are suppressed
 	}
 }
-
-func TestPoll(t *testing.T) {
-	tt := []struct {
-		name         string
-		collectorErr error
-		output       error
-	}{
-		{
-			name:         "no error",
-			collectorErr: nil,
-			output:       nil,
-		},
-		{
-			name:         "custom error",
-			collectorErr: errors.New("custom error"),
-			output:       errors.New("custom error"),
-		},
-		{
-			name:         "unexpected EOF",
-			collectorErr: io.ErrUnexpectedEOF,
-			output:       nil,
-		},
-		{
-			name: "http timeout",
-			collectorErr: &url.Error{
-				Op:  "POST",
-				URL: "/url",
-				Err: &timeoutError{},
-			},
-			output: nil,
-		},
-		{
-			name: "http unexpected EOF",
-			collectorErr: &url.Error{
-				Op:  "POST",
-				URL: "/url",
-				Err: io.ErrUnexpectedEOF,
-			},
-			output: nil,
-		},
-	}
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			o := org{
-				ID: tc.name,
-			}
-			err := poll(o, func(org) error {
-				return tc.collectorErr
-			})
-			if tc.output != nil {
-				if err == nil {
-					t.Fatalf("expected output error but got nil")
-				}
-				if tc.output.Error() != err.Error() {
-					t.Fatalf("expected error '%s' but got '%s'", tc.output.Error(), err.Error())
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected output error '%s'", err)
-			}
-		})
-	}
-}
-
-type timeoutError struct{}
-
-func (err *timeoutError) Timeout() bool {
-	return true
-}
-
-func (err *timeoutError) Error() string {
-	return "timeout error"
-}