Abstract logger.

config/config.go

@@ -49,6 +49,12 @@ type Updater interface {
 	OverrideConfig(*Config) error
 }
 
+type Logger interface {
+	Printf(format string, v ...interface{})
+	Print(v ...interface{})
+	Println(v ...interface{})
+}
+
 // Config passes along Amass configuration settings and options.
 type Config struct {
 	sync.Mutex
@@ -57,7 +63,7 @@ type Config struct {
 	UUID uuid.UUID
 
 	// Logger for error messages
-	Log *log.Logger
+	Log Logger
 
 	// The directory that stores the bolt db and other files created
 	Dir string `ini:"output_directory"`

resolvers/base.go

@@ -28,13 +28,13 @@ type baseResolver struct {
 	readMsgs         queue.Queue
 	wildcardChannels *wildcardChans
 	address          string
-	log              *log.Logger
+	log              Logger
 	perSec           int
 	conn             *dns.Conn
 }
 
 // NewBaseResolver initializes a Resolver that send DNS queries to the provided IP address.
-func NewBaseResolver(addr string, perSec int, logger *log.Logger) Resolver {
+func NewBaseResolver(addr string, perSec int, logger Logger) Resolver {
 	if _, _, err := net.SplitHostPort(addr); err != nil {
 		// Add the default port number to the IP address
 		addr = net.JoinHostPort(addr, "53")

resolvers/logger.go

@@ -0,0 +1,7 @@
+package resolvers
+
+type Logger interface {
+	Printf(format string, v ...interface{})
+	Print(v ...interface{})
+	Println(v ...interface{})
+}

resolvers/pool.go

@@ -17,7 +17,7 @@ type resolverPool struct {
 	sync.Mutex
 	done chan struct{}
 	// Logger for error messages
-	log            *log.Logger
+	log            Logger
 	baseline       Resolver
 	resolvers      []Resolver
 	curIdx         int
@@ -28,7 +28,7 @@ type resolverPool struct {
 }
 
 // NewResolverPool initializes a ResolverPool that uses the provided Resolvers.
-func NewResolverPool(resolvers []Resolver, delay time.Duration, baseline Resolver, logger *log.Logger) Resolver {
+func NewResolverPool(resolvers []Resolver, delay time.Duration, baseline Resolver, logger Logger) Resolver {
 	if len(resolvers) == 0 {
 		return nil
 	}

systems/local.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log"
 	"os"
 	"runtime"
 	"sort"
@@ -23,6 +22,12 @@ import (
 	"github.com/miekg/dns"
 )
 
+type Logger interface {
+	Printf(format string, v ...interface{})
+	Print(v ...interface{})
+	Println(v ...interface{})
+}
+
 // LocalSystem implements a System to be executed within a single process.
 type LocalSystem struct {
 	cfg               *config.Config
@@ -324,7 +329,7 @@ func publicResolverSetup(cfg *config.Config, max int) resolvers.Resolver {
 	return resolvers.NewResolverPool(r, 5*time.Second, baseline, cfg.Log)
 }
 
-func setupResolvers(addrs []string, max, rate int, log *log.Logger) []resolvers.Resolver {
+func setupResolvers(addrs []string, max, rate int, log Logger) []resolvers.Resolver {
 	if len(addrs) <= 0 {
 		return nil
 	}