Less debug logging

config.go

@@ -149,7 +149,7 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
 				continue
 			}
 
-			log.Printf("rdata %s TYPE-R %T\n", rdata, rdata)
+			//log.Printf("rdata %s TYPE-R %T\n", rdata, rdata)
 
 			records := make(map[string][]interface{})
 
@@ -248,7 +248,6 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
 						rr.Ns = rec.(string)
 					case []string:
 						recl := rec.([]string)
-						log.Println("RECL:", recl)
 						rr.Ns = recl[0]
 						if len(recl[1]) > 0 {
 							log.Println("NS records with names syntax not supported")

picker.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"log"
 	"math/rand"
 )
 
@@ -9,8 +8,6 @@ func (label *Label) Picker(dnsType uint16, max int) Records {
 
 	if label_rr := label.Records[dnsType]; label_rr != nil {
 
-		log.Printf("REGION_RR %i %T %v\n", len(label_rr), label_rr, label_rr)
-
 		// not "balanced", just return all
 		if label.Weight[dnsType] == 0 {
 			return label_rr
@@ -33,7 +30,6 @@ func (label *Label) Picker(dnsType uint16, max int) Records {
 			for i := range servers {
 				s += int(servers[i].Weight)
 				if s >= n {
-					log.Println("Picked record", i, servers[i])
 					sum -= servers[i].Weight
 					result[si] = servers[i]
 
@@ -44,8 +40,6 @@ func (label *Label) Picker(dnsType uint16, max int) Records {
 			}
 		}
 
-		log.Println("SERVERS", result)
-
 		return result
 	}
 	return nil

serve.go

@@ -21,16 +21,18 @@ func serve(w dns.ResponseWriter, req *dns.Msg, z *Zone) {
 	logPrintf("[zone %s] incoming %s %s %d from %s\n", z.Origin, req.Question[0].Name,
 		dns.Rr_str[qtype], req.MsgHdr.Id, w.RemoteAddr())
 
-	//log.Printf("ZONE DATA  %#v\n", z)
-
-	log.Println("Got request", req)
+	if *flaglog {
+		log.Println("Got request", req)
+	}
 
 	label := getQuestionName(z, req)
 
 	var country string
 	if geoIP != nil {
 		country = geoIP.GetCountry(w.RemoteAddr().String())
-		log.Println("Country:", country)
+		if *flaglog {
+			log.Println("Country:", country)
+		}
 	}
 
 	m := new(dns.Msg)
@@ -59,13 +61,10 @@ func serve(w dns.ResponseWriter, req *dns.Msg, z *Zone) {
 		return
 	}
 
-	log.Println("Has the label, looking for records")
-
 	if servers := labels.Picker(qtype, 4); servers != nil {
 		var rrs []dns.RR
 		for _, record := range servers {
 			rr := record.RR
-			log.Println("RR", rr)
 			rr.Header().Name = req.Question[0].Name
 			log.Println(rr)
 			rrs = append(rrs, rr)
@@ -84,8 +83,6 @@ func serve(w dns.ResponseWriter, req *dns.Msg, z *Zone) {
 		}
 	}
 
-	log.Println("Writing reply")
-
 	w.Write(m)
 	return
 }