Rename configReadDir and related functions to zones*

config.go

@@ -18,11 +18,11 @@ import (
 	"time"
 )
 
-var configLastRead = map[string]time.Time{}
+var zonesLastRead = map[string]time.Time{}
 
-func configReader(dirName string, zones Zones) {
+func zonesReader(dirName string, zones Zones) {
 	for {
-		configReadDir(dirName, zones)
+		zonesReadDir(dirName, zones)
 		time.Sleep(5 * time.Second)
 	}
 }
@@ -32,7 +32,7 @@ func addHandler(zones Zones, name string, config *Zone) {
 	dns.HandleFunc(name, setupServerFunc(config))
 }
 
-func configReadDir(dirName string, zones Zones) error {
+func zonesReadDir(dirName string, zones Zones) error {
 	dir, err := ioutil.ReadDir(dirName)
 	if err != nil {
 		log.Println("Could not read", dirName, ":", err)
@@ -51,14 +51,15 @@ func configReadDir(dirName string, zones Zones) error {
 
 		seenFiles[fileName] = true
 
-		if lastRead, ok := configLastRead[fileName]; !ok || file.ModTime().After(lastRead) {
+		if lastRead, ok := zonesLastRead[fileName]; !ok || file.ModTime().After(lastRead) {
 			if ok {
 				log.Printf("Reloading %s\n", fileName)
 			} else {
 				logPrintf("Reading new file %s\n", fileName)
 			}
-			configLastRead[fileName] = file.ModTime()
-			zoneName := fileName[0:strings.LastIndex(fileName, ".")]
+			zonesLastRead[fileName] = file.ModTime()
+
+			zoneName := zoneNameFromFile(fileName)
 			//log.Println("FILE:", i, file, zoneName)
 			config, err := readZoneFile(zoneName, path.Join(dirName, fileName))
 			if config == nil || err != nil {
@@ -414,3 +415,7 @@ func valueToInt(v interface{}) (rv int) {
 	}
 	return rv
 }
+
+func zoneNameFromFile(fileName string) string {
+	return fileName[0:strings.LastIndex(fileName, ".")]
+}

config_test.go

@@ -17,7 +17,7 @@ var _ = Suite(&ConfigSuite{})
 
 func (s *ConfigSuite) TestReadConfigs(c *C) {
 	s.zones = make(Zones)
-	configReadDir("dns", s.zones)
+	zonesReadDir("dns", s.zones)
 
 	// Just check that example.com and test.example.org loaded, too.
 	c.Check(s.zones["example.com"].Origin, Equals, "example.com")

geodns.go

@@ -47,7 +47,7 @@ func main() {
 		dirName := *flagconfig
 		Zones := make(Zones)
 		setupPgeodnsZone(Zones)
-		err := configReadDir(dirName, Zones)
+		err := zonesReadDir(dirName, Zones)
 		if err != nil {
 			log.Println("Errors reading config")
 			os.Exit(2)
@@ -100,7 +100,7 @@ func main() {
 
 	setupPgeodnsZone(Zones)
 
-	go configReader(dirName, Zones)
+	go zonesReader(dirName, Zones)
 
 	for _, host := range inter {
 		go listenAndServe(host)

serve_test.go

@@ -23,7 +23,7 @@ func (s *ServeSuite) SetUpSuite(c *C) {
 
 	Zones := make(Zones)
 	setupPgeodnsZone(Zones)
-	configReadDir("dns", Zones)
+	zonesReadDir("dns", Zones)
 
 	go listenAndServe(PORT)