Merge pull request d2iq-archive#352 from mesosphere/mesos-dns-223

Move util.IgnoreError to errorutil.IgnoreErrror

errorutil/errorutil.go

@@ -0,0 +1,12 @@
+package errorutil
+
+// ErrorFunction A function definition that returns an error
+// to be passed to the Ignore or Panic error handler
+type ErrorFunction func() error
+
+// Ignore Calls an ErrorFunction, and ignores the result.
+// This allows us to be more explicit when there is no error
+// handling to be done, for example in defers
+func Ignore(f ErrorFunction) {
+	_ = f()
+}

errorutil/errorutil_test.go

@@ -0,0 +1,20 @@
+package errorutil
+
+import (
+	"errors"
+	"testing"
+)
+
+func returnsError() error {
+	return errors.New("test")
+}
+func TestIgnoreHandler(t *testing.T) {
+	defer func() {
+		if r := recover(); r != nil {
+			t.Fatal("IgnoreHandler did not ignore Error")
+		}
+	}()
+
+	Ignore(returnsError)
+
+}

records/generator.go

@@ -15,10 +15,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/mesosphere/mesos-dns/errorutil"
 	"github.com/mesosphere/mesos-dns/logging"
 	"github.com/mesosphere/mesos-dns/records/labels"
 	"github.com/mesosphere/mesos-dns/records/state"
-	"github.com/mesosphere/mesos-dns/util"
 )
 
 // Map host/service name to DNS answer
@@ -138,7 +138,7 @@ func (rg *RecordGenerator) loadFromMaster(ip string, port string) (state.State,
 		return state.State{}, err
 	}
 
-	defer util.IgnoreError(resp.Body.Close)
+	defer errorutil.Ignore(resp.Body.Close)
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		logging.Error.Println(err)

util/util.go

@@ -52,14 +52,3 @@ func logPanic(r interface{}) {
 	}
 	log.Printf("Recovered from panic: %#v (%v)\n%v", r, r, callers)
 }
-
-// ErrorFunction A function definition that returns an error
-// to be passed to the Ignore or Panic error handler
-type ErrorFunction func() error
-
-// IgnoreError Calls an ErrorFunction, and ignores the result.
-// This allows us to be more explicit when there is no error
-// handling to be done, for example in defers
-func IgnoreError(f ErrorFunction) {
-	_ = f()
-}

util/util_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package util
 
 import (
-	"errors"
 	"testing"
 )
 
@@ -53,17 +52,3 @@ func TestCustomHandleCrash(t *testing.T) {
 		t.Errorf("did not receive custom handler")
 	}
 }
-
-func returnsError() error {
-	return errors.New("test")
-}
-func TestIgnoreHandler(t *testing.T) {
-	defer func() {
-		if r := recover(); r != nil {
-			t.Fatal("IgnoreHandler did not ignore Error")
-		}
-	}()
-
-	IgnoreError(returnsError)
-
-}