Make -checkconfig work again

geodns.go

@@ -131,10 +131,9 @@ func main() {
 			os.Exit(2)
 		}
 
-		// dirName := *flagconfig
-		// Zones := make(zones.Zones)
-		// srv.setupPgeodnsZone(Zones)
-		// err = srv.zonesReadDir(dirName, Zones)
+		dirName := *flagconfig
+
+		_, err = zones.NewMuxManager(dirName, &zones.NilReg{})
 		if err != nil {
 			log.Println("Errors reading zones", err)
 			os.Exit(2)

zones/muxmanager.go

@@ -27,6 +27,11 @@ type MuxManager struct {
 	lastRead map[string]*zoneReadRecord
 }
 
+type NilReg struct{}
+
+func (r *NilReg) Add(string, *Zone) {}
+func (r *NilReg) Remove(string)     {}
+
 // track when each zone was read last
 type zoneReadRecord struct {
 	time time.Time

zones/reader_test.go

@@ -8,15 +8,9 @@ import (
 	"testing"
 )
 
-type TestReg struct{}
-
-func (r *TestReg) Add(name string, zone *Zone) {}
-
-func (r *TestReg) Remove(name string) {}
-
 func TestReadConfigs(t *testing.T) {
 
-	muxm, err := NewMuxManager("../dns", &TestReg{})
+	muxm, err := NewMuxManager("../dns", &NilReg{})
 	if err != nil {
 		t.Logf("loading zones: %s", err)
 		t.Fail()
@@ -86,7 +80,7 @@ func TestRemoveConfig(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	muxm, err := NewMuxManager(dir, &TestReg{})
+	muxm, err := NewMuxManager(dir, &NilReg{})
 	if err != nil {
 		t.Logf("loading zones: %s", err)
 		t.Fail()

zones/zone_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestExampleComZone(t *testing.T) {
-	mm, err := NewMuxManager("../dns", &TestReg{})
+	mm, err := NewMuxManager("../dns", &NilReg{})
 	if err != nil {
 		t.Fatalf("Loading test zones: %s", err)
 	}
@@ -108,7 +108,7 @@ func TestExampleComZone(t *testing.T) {
 }
 
 func TestExampleOrgZone(t *testing.T) {
-	mm, err := NewMuxManager("../dns", &TestReg{})
+	mm, err := NewMuxManager("../dns", &NilReg{})
 	if err != nil {
 		t.Fatalf("Loading test zones: %s", err)
 	}