From 080acc8f3c143a676b568d40c608eb3de4eef41f Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Tue, 28 Mar 2023 08:54:18 -0500
Subject: [PATCH] remove places it would exit()

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 args.go     |   1 -
 dnstrace.go |   3 +-
 log.go      | 129 ++++++++--------------------------------------------
 3 files changed, 21 insertions(+), 112 deletions(-)

diff --git a/args.go b/args.go
index 555e42c..cbd9fe7 100644
--- a/args.go
+++ b/args.go
@@ -40,6 +40,5 @@ func Parse (p *arg.Parser) {
 		log.Println("dnssec.Parse", i, v)
 	}
 	p.Jcarr()
-	exit()
 }
 */
diff --git a/dnstrace.go b/dnstrace.go
index 7377203..d8fca38 100644
--- a/dnstrace.go
+++ b/dnstrace.go
@@ -137,14 +137,13 @@ func Dnstrace(hostname string, qtypestr string) []dns.RR {
 	r, rtt, err := c.RecursiveQuery(m, t)
 	if err != nil {
 		log(args.VerboseDnssec, col("*** error: %v\n", cRed), err)
-		exit(1)
+		return nil
 	}
 
 	log(args.VerboseDnssec)
 	log(args.VerboseDnssec, col(";; Cold best path time: %s\n\n", cGray), rtt)
 	for i, rr := range r.Answer {
 		log(args.VerboseDnssec, "r.Answer =", i, rr, args.VerboseDnssec)
-		// exit(0)
 	}
 	return r.Answer
 	// for _, rr := range r.Answer {
diff --git a/log.go b/log.go
index 77dff6d..0cbd91f 100644
--- a/log.go
+++ b/log.go
@@ -1,119 +1,30 @@
-//
-// version v1.1
-//
-// I like things to be easy.
-//
-// this means all the log settings are in one place. it should allow
-// things to be over-ridden externally to the library
-// but still allow command line --args to pass debugging settings
-//
-// I also have a generic sleep() and exit() in here because it's simple
-//
-// Usage:
-//
-// log("something", foo, bar)
-// var DEBUG bool = true
-// log(DEBUG, "something else", someOtherVariable)  # if DEBUG == false, return doing nothing
-// log(SPEW, "something else", someOtherVariable)   # this get's sent to spew.Dump(). Very useful for debugging!
-//
 package dnssecsocket
 
 import 	(
-	"os"
-	golog "log"
-	"time"
-	"reflect"
-	"github.com/davecgh/go-spew/spew"
-	// "net"
+	witlog "git.wit.org/wit/gui/log"
 )
 
-var 	LOGOFF	bool	= false	// turn this off, all logging stops
-var	WARN	bool
-var 	INFO	bool
+// various debugging flags
+var logNow bool = true	// useful for active development
+var logError bool = true
+var logWarn bool = false
+var logInfo bool = false
+var logVerbose bool = false
 
-type spewt struct {
-	a bool
-}
+var SPEW witlog.Spewt
 
-var SPEW spewt
-
-
-/*
-	sleep()		# you know what this does? sleeps for 1 second. yep. dump. easy.
-	sleep(.1)	# you know what this does? yes, it sleeps for 1/10th of a second
-*/
-func sleep(a ...any) {
-	if (a == nil) {
-		time.Sleep(time.Second)
-		return
-	}
-
-	log(args.Verbose, "sleep", a[0])
-
-	switch a[0].(type) {
-	case int:
-		time.Sleep(time.Duration(a[0].(int)) * time.Second)
-	case float64:
-		time.Sleep(time.Duration(a[0].(float64) * 1000) * time.Millisecond)
-	default:
-		log("sleep a[0], type = ", a[0], reflect.TypeOf(a[0]))
-	}
-}
-
-/*
-	exit()		# yep. exits. I guess everything must be fine
-	exit(3)		# I guess 3 it is then
-	exit("dont like apples")	# ok. I'll make a note of that
-*/
-func exit(a ...any) {
-	log("exit", a)
-	//if (a) {
-	//	os.Exit(a)
-	//}
-	os.Exit(0)
-}
-
-/*
-	I've spent, am spending, too much time thinking about 'logging'. 'log', 'logrus', 'zap', whatever.
-	I'm not twitter. i don't give a fuck about how many nanoseconds it takes to log. Anyway, this
-	implementation is probably faster than all of those because you just set one bool to FALSE
-	and it all stops.
-	Sometimes I need to capture to stdout, sometimes stdout can't
-	work because it doesn't exist for the user. This whole thing is a PITA. Then it's spread
-	over 8 million references in every .go file. I'm tapping out and putting
-	it in one place. here it is. Also, this makes having debug levels really fucking easy.
-	You can define whatever level of logging you want from anywhere (command line) etc.
-
-	log()		# doesn't do anything
-	log(stuff)	# sends it to whatever log you define in a single place. here is the place
-*/
+// var log interface{}
 
 func log(a ...any) {
-	if (LOGOFF) {
-		return
-	}
-
-	if (a == nil) {
-		return
-	}
-	var blah bool
-	if (reflect.TypeOf(a[0]) == reflect.TypeOf(blah)) {
-		// golog.Println("\t a[0] = bool")
-		if (a[0] == false) {
-			return
-		}
-		a = a[1:]
-	}
-
-	if (reflect.TypeOf(a[0]) == reflect.TypeOf(SPEW)) {
-		a = a[1:]
-		spew.Dump(a)
-		return
-	}
-
-	golog.Println(a...)
-	// golog.Println("\t a[0] =", a[0])
-	// for argNum, arg := range a {
-	// 	golog.Println("\t", argNum, arg)
-	// }
+	witlog.Where = "wit/gui"
+	witlog.Log(a...)
+}
+
+func sleep(a ...any) {
+	witlog.Sleep(a...)
+}
+
+func exit(a ...any) {
+	log(logError, "got to log() exit")
+	witlog.Exit(a...)
 }