move logger to root command

Signed-off-by: Bruno Schaatsbergen <[email protected]>

Author: bschaatsbergen

cmd/root.go

@@ -3,7 +3,9 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strings"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-multierror"
 	"github.com/spf13/cobra"
 	"github.com/znscli/zns/internal/query"
@@ -12,7 +14,9 @@ import (
 var (
 	version string
 
-	debug bool
+	debug  bool
+	server string
+	qtype  string
 
 	rootCmd = &cobra.Command{
 		Use:     "zns",
@@ -25,13 +29,50 @@ var (
 				os.Exit(1)
 			}
 
-			querier := query.NewQuerier("1.1.1.1:53", nil)
+			// Determine log level based on environment variable and debug flag
+			logLevel := os.Getenv("ZNS_LOG_LEVEL")
+			if debug {
+				logLevel = "DEBUG" // Override log level to DEBUG if the debug flag is set
+			}
+
+			logger := hclog.New(&hclog.LoggerOptions{
+				Name:                 "zns",
+				Level:                hclog.LevelFromString(logLevel),
+				Color:                hclog.AutoColor,
+				ColorHeaderAndFields: true,
+				DisableTime:          true,
+			})
+
+			// Log the debug state and current log level
+			logger.Debug("Debug logging enabled", "debug", debug)
+			logger.Debug("Log level", "level", logger.GetLevel())
+
+			// Log the arguments and flags
+			logger.Debug("Args", "args", args)
+			logger.Debug("Flags", "server", server, "qtype", qtype, "debug", debug)
+
+			// Create a new querier
+			querier := query.NewQuerier(fmt.Sprintf("%s:53", server), logger)
 
+			logger.Debug("Creating querier", "server", server, "qtype", qtype, "domain", args[0])
+
+			// Prepare query types
 			qtypes := make([]uint16, 0, len(query.QueryTypes))
 			for _, qtype := range query.QueryTypes {
 				qtypes = append(qtypes, qtype)
 			}
 
+			// Set specific query type if provided
+			if qtype != "" {
+				qtypeInt, ok := query.QueryTypes[strings.ToUpper(qtype)]
+				if !ok {
+					fmt.Printf("error: invalid query type: %s\n", qtype)
+					os.Exit(1)
+				}
+				qtypes = []uint16{qtypeInt}
+			}
+
+			// Execute the query
 			messages, err := querier.MultiQuery(args[0], qtypes)
 			if err != nil {
 				if merr, ok := err.(*multierror.Error); ok {
@@ -44,14 +85,17 @@ var (
 				os.Exit(1)
 			}
 
+			// Print the records
 			printRecords(args[0], messages)
 		},
 	}
 )
 
 func init() {
 	rootCmd.CompletionOptions.DisableDefaultCmd = true
-	rootCmd.Flags().BoolVarP(&debug, "debug", "d", false, "verbose logging")
+	rootCmd.Flags().StringVarP(&server, "server", "s", "1.1.1.1", "DNS server to query")
+	rootCmd.Flags().StringVarP(&qtype, "query-type", "q", "", "DNS query type")
+	rootCmd.Flags().BoolVar(&debug, "debug", false, "Enable debug logging")
 }
 
 func Execute() {

internal/query/query.go

@@ -4,7 +4,6 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-multierror"
 	"github.com/miekg/dns"
-	"os"
 	"sync"
 )
 
@@ -36,14 +35,6 @@ type Query struct {
 
 // NewQuerier creates a new Querier with the specified server.
 func NewQuerier(server string, logger hclog.Logger) Querier {
-	if logger == nil {
-		logger = hclog.New(&hclog.LoggerOptions{
-			Name:        "zns",
-			Level:       hclog.LevelFromString(os.Getenv("ZNS_LOG_LEVEL")),
-			Color:       hclog.AutoColor,
-			DisableTime: true,
-		})
-	}
 	return &Query{Server: server, Logger: logger}
 }
 
@@ -73,11 +64,16 @@ func (q *Query) Query(domain string, qtype uint16) (*dns.Msg, error) {
 	msg := new(dns.Msg)
 	msg.SetQuestion(dns.Fqdn(domain), qtype)
 
+	q.Logger.Debug("Querying DNS server", "server", q.Server, "domain", domain, "qtype", dns.TypeToString[qtype])
+
 	client := new(dns.Client)
-	resp, _, err := client.Exchange(msg, q.Server)
+	resp, rtt, err := client.Exchange(msg, q.Server)
 	if err != nil {
 		return nil, err
 	}
 
+	q.Logger.Debug("Received DNS response", "server", q.Server, "domain", domain, "qtype", dns.TypeToString[qtype], "rcode", dns.RcodeToString[resp.Rcode])
+	q.Logger.Debug("Round trip time", "rtt", rtt)
+
 	return resp, nil
 }