removed logging from sub packages

Author: lanrat

main.go

@@ -66,13 +66,17 @@ func main() {
 		// not all the root nameservers allow AXFR, try them until we find one that does
 		for _, ns := range rootNameservers {
 			v("trying root nameserver %s", ns)
+			startTime := time.Now()
 			z, err = zone.RootAXFR(ns)
 			if err == nil {
+				took := time.Since(startTime).Round(time.Millisecond)
+				log.Printf("ROOT %s xfr size: %d records in %s \n", ns, z.Records, took.String())
 				break
 			}
 		}
 	} else {
 		// zone file is provided
+		v("parsing zonefile: %q\n", *zonefile)
 		z, err = zone.ParseZoneFile(*zonefile)
 		check(err)
 	}

zone/parse.go

@@ -3,7 +3,6 @@ package zone
 import (
 	"compress/gzip"
 	"io"
-	"log"
 	"os"
 	"strings"
 
@@ -28,7 +27,6 @@ func ParseZoneFile(filename string) (Zone, error) {
 		fileReader = gz
 		defer gz.Close()
 	}
-	log.Printf("parsing zonefile: %q\n", filename)
 	zp := dns.NewZoneParser(fileReader, "", "")
 	for rr, ok := zp.Next(); ok; rr, ok = zp.Next() {
 		z.AddRecord(rr)
@@ -37,6 +35,5 @@ func ParseZoneFile(filename string) (Zone, error) {
 	if err := zp.Err(); err != nil {
 		return z, err
 	}
-	//log.Printf("zonefile parsing done")
 	return z, nil
 }

zone/root.go

@@ -2,8 +2,6 @@ package zone
 
 import (
 	"fmt"
-	"log"
-	"time"
 
 	"github.com/miekg/dns"
 )
@@ -34,29 +32,20 @@ func GetRootServers(nameserver string) ([]string, error) {
 func RootAXFR(ns string) (Zone, error) {
 	m := new(dns.Msg)
 	m.SetQuestion(".", dns.TypeAXFR)
-
 	t := new(dns.Transfer)
 
 	var root Zone
-	startTime := time.Now()
-
 	env, err := t.In(m, fmt.Sprintf("%s:53", ns))
 	if err != nil {
 		return root, fmt.Errorf("transfer error from %v: %w", ns, err)
 	}
-	var envelope, record int
 	for e := range env {
 		if e.Error != nil {
 			return root, fmt.Errorf("transfer envelope error from %v: %w", ns, e.Error)
 		}
 		for _, r := range e.RR {
 			root.AddRecord(r)
 		}
-		record += len(e.RR)
-		envelope++
 	}
-	took := time.Since(startTime).Round(time.Millisecond)
-	log.Printf("ROOT %s xfr size: %d records in %s \n", ns, record, took.String())
-
 	return root, nil
 }

zone/zone.go

@@ -14,6 +14,8 @@ type Zone struct {
 	NS map[string][]string
 	// map of nameservers to ipv4 and ipv6
 	IP map[string][]net.IP
+	// number of records added to the zone
+	Records int64
 }
 
 // AddRecord adds NS, A, AAAA records to the zone
@@ -66,6 +68,7 @@ func (z *Zone) AddNS(domain, nameserver string) {
 	if len(nameserver) > 0 {
 		nameserver = strings.ToLower(nameserver)
 		z.NS[domain] = append(z.NS[domain], nameserver)
+		z.Records++
 	}
 }
 
@@ -80,6 +83,7 @@ func (z *Zone) AddIP(nameserver string, ip net.IP) {
 		z.IP[nameserver] = make([]net.IP, 0, 4)
 	}
 	z.IP[nameserver] = append(z.IP[nameserver], ip)
+	z.Records++
 }
 
 // Print prints the zone to stdout