From 3de924fa2f5d300ed9d4c04feeea182d89a036a4 Mon Sep 17 00:00:00 2001
From: Alvaro Saurin <alvaro.saurin@gmail.com>
Date: Thu, 19 Feb 2015 22:04:42 +0100
Subject: [PATCH] zettio/weave#362 - moved `Check*()` to `common`

---
 common/errors.go               | 13 +++++++++++++
 nameserver/mdns_client_test.go |  7 ++++---
 nameserver/server.go           | 12 ++++++------
 nameserver/util.go             | 17 -----------------
 4 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 common/errors.go
 delete mode 100644 nameserver/util.go

diff --git a/common/errors.go b/common/errors.go
new file mode 100644
index 00000000..23072055
--- /dev/null
+++ b/common/errors.go
@@ -0,0 +1,13 @@
+package common
+
+func CheckFatal(e error) {
+	if e != nil {
+		Error.Fatal(e)
+	}
+}
+
+func CheckWarn(e error) {
+	if e != nil {
+		Warning.Println(e)
+	}
+}
diff --git a/nameserver/mdns_client_test.go b/nameserver/mdns_client_test.go
index aa9ad6a5..c21c1f18 100644
--- a/nameserver/mdns_client_test.go
+++ b/nameserver/mdns_client_test.go
@@ -2,6 +2,7 @@ package nameserver
 
 import (
 	"github.com/miekg/dns"
+	. "github.com/zettio/weave/common"
 	wt "github.com/zettio/weave/testing"
 	"log"
 	"net"
@@ -20,18 +21,18 @@ func minimalServer(w dns.ResponseWriter, req *dns.Msg) {
 
 	sendAnswer := func(m *dns.Msg) {
 		buf, err := m.Pack()
-		checkFatal(err)
+		CheckFatal(err)
 		if buf == nil {
 			log.Fatal("Nil buffer")
 		}
 		//log.Println("minimalServer sending:", buf)
 		// This is a bit of a kludge - per the RFC we should send responses from 5353, but that doesn't seem to work
 		sendconn, err := net.DialUDP("udp", nil, ipv4Addr)
-		checkFatal(err)
+		CheckFatal(err)
 
 		_, err = sendconn.Write(buf)
 		sendconn.Close()
-		checkFatal(err)
+		CheckFatal(err)
 	}
 
 	//log.Println("minimalServer received:", req)
diff --git a/nameserver/server.go b/nameserver/server.go
index 984e00fb..1291a06d 100644
--- a/nameserver/server.go
+++ b/nameserver/server.go
@@ -42,7 +42,7 @@ func NewDNSServer(config *dns.ClientConfig, zone Zone, iface *net.Interface, por
 // Start the DNS server
 func (s *DNSServer) Start() error {
 	mdnsClient, err := NewMDNSClient()
-	checkFatal(err)
+	CheckFatal(err)
 
 	ifaceName := "default interface"
 	if s.iface != nil {
@@ -50,7 +50,7 @@ func (s *DNSServer) Start() error {
 	}
 	Info.Printf("Using mDNS on %s", ifaceName)
 	err = mdnsClient.Start(s.iface)
-	checkFatal(err)
+	CheckFatal(err)
 
 	// create two DNS request multiplexerers, depending on the protocol used by clients
 	// (we use the same protocol for asking upstream servers)
@@ -63,10 +63,10 @@ func (s *DNSServer) Start() error {
 	}
 
 	mdnsServer, err := NewMDNSServer(s.zone)
-	checkFatal(err)
+	CheckFatal(err)
 
 	err = mdnsServer.Start(s.iface)
-	checkFatal(err)
+	CheckFatal(err)
 
 	address := fmt.Sprintf(":%d", s.port)
 	s.udpSrv = &dns.Server{Addr: address, Net: "udp", Handler: mux(&dns.Client{Net: "udp", UDPSize: UDPBufSize})}
@@ -75,13 +75,13 @@ func (s *DNSServer) Start() error {
 	go func() {
 		Info.Printf("Listening for DNS on %s (UDP)", address)
 		err = s.udpSrv.ListenAndServe()
-		checkFatal(err)
+		CheckFatal(err)
 	}()
 
 	go func() {
 		Info.Printf("Listening for DNS on %s (TCP)", address)
 		err = s.tcpSrv.ListenAndServe()
-		checkFatal(err)
+		CheckFatal(err)
 	}()
 
 	return nil
diff --git a/nameserver/util.go b/nameserver/util.go
deleted file mode 100644
index 9e25dfc2..00000000
--- a/nameserver/util.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package nameserver
-
-import (
-	. "github.com/zettio/weave/common"
-)
-
-func checkFatal(e error) {
-	if e != nil {
-		Error.Fatal(e)
-	}
-}
-
-func checkWarn(e error) {
-	if e != nil {
-		Warning.Println(e)
-	}
-}