From 84c1341b8cd2a23e77251d2dde4ea0bb3b22c0ff Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 12 Feb 2024 21:42:02 -0600 Subject: use standard debugger.go file --- args.go | 64 ------------------------------------------------------------- debugger.go | 26 +++++++++++++++++++++++++ flags.go | 43 +++++++++++++++++++++++++++++++++++++++++ main.go | 5 ----- 4 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 args.go create mode 100644 debugger.go create mode 100644 flags.go diff --git a/args.go b/args.go deleted file mode 100644 index cf68339..0000000 --- a/args.go +++ /dev/null @@ -1,64 +0,0 @@ -package main - -/* - this parses the command line arguements - - this enables command line options from other packages like 'gui' and 'log' -*/ - -import ( - "time" - - "go.wit.com/dev/alexflint/arg" - "go.wit.com/lib/debugger" - "go.wit.com/log" -) - -var args struct { - Display string `arg:"env:DISPLAY"` - TmpLog bool `arg:"--tmp-log" help:"automatically send STDOUT to /tmp"` - VerboseDNS bool `arg:"--verbose-dns" help:"debug your dns settings"` -} - -var NOW *log.LogFlag -var INFO *log.LogFlag -var NET *log.LogFlag -var DNS *log.LogFlag - -var WARN *log.LogFlag -var SPEW *log.LogFlag - -var CHANGE *log.LogFlag -var STATUS *log.LogFlag - -func init() { - arg.MustParse(&args) - full := "go.wit.com/control-panels/dns" - short := "cpdns" - - NOW = log.NewFlag("NOW", true, full, short, "temp debugging stuff") - INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff") - NET = log.NewFlag("NET", false, full, short, "Network logging") - DNS = log.NewFlag("DNS", false, full, short, "dnsStatus.update()") - - WARN = log.NewFlag("WARN", true, full, short, "bad things") - SPEW = log.NewFlag("SPEW", false, full, short, "spew stuff") - - CHANGE = log.NewFlag("CHANGE", true, full, short, "when host or dns change") - STATUS = log.NewFlag("STATUS", false, full, short, "updateStatus() polling") - - if debugger.ArgDebug() { - log.Log(NOW, "INIT() gui debug == true") - } else { - log.Log(NOW, "INIT() gui debug == false") - } - - me.dnsSleep = 500 * time.Millisecond - me.localSleep = 100 * time.Millisecond - - me.artificialSleep = 0.4 // seems to need to exist or GTK crashes. TODO: fix andlabs plugin - me.artificialS = "blah" - log.Log(INFO, "init() me.artificialSleep =", me.artificialSleep) - log.Log(INFO, "init() me.artificialS =", me.artificialS) - log.Sleep(me.artificialSleep) -} diff --git a/debugger.go b/debugger.go new file mode 100644 index 0000000..116d549 --- /dev/null +++ b/debugger.go @@ -0,0 +1,26 @@ +package main + +/* + enables GUI options and the debugger in your application +*/ + +import ( + "go.wit.com/dev/alexflint/arg" + "go.wit.com/lib/debugger" + "go.wit.com/log" +) + +var args struct { +} + +func init() { + arg.MustParse(&args) + + if debugger.ArgDebug() { + log.Info("cmd line --debugger == true") + go func() { + log.Sleep(2) + debugger.DebugWindow() + }() + } +} diff --git a/flags.go b/flags.go new file mode 100644 index 0000000..fbc54ba --- /dev/null +++ b/flags.go @@ -0,0 +1,43 @@ +package main + +import ( + "time" + + "go.wit.com/log" +) + +var NOW *log.LogFlag +var INFO *log.LogFlag +var NET *log.LogFlag +var DNS *log.LogFlag + +var WARN *log.LogFlag +var SPEW *log.LogFlag + +var CHANGE *log.LogFlag +var STATUS *log.LogFlag + +func init() { + full := "go.wit.com/control-panels/dns" + short := "cpdns" + + NOW = log.NewFlag("NOW", true, full, short, "temp debugging stuff") + INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff") + NET = log.NewFlag("NET", false, full, short, "Network logging") + DNS = log.NewFlag("DNS", false, full, short, "dnsStatus.update()") + + WARN = log.NewFlag("WARN", true, full, short, "bad things") + SPEW = log.NewFlag("SPEW", false, full, short, "spew stuff") + + CHANGE = log.NewFlag("CHANGE", true, full, short, "when host or dns change") + STATUS = log.NewFlag("STATUS", false, full, short, "updateStatus() polling") + + me.dnsSleep = 500 * time.Millisecond + me.localSleep = 100 * time.Millisecond + + me.artificialSleep = 0.4 // seems to need to exist or GTK crashes. TODO: fix andlabs plugin + me.artificialS = "blah" + log.Log(INFO, "init() me.artificialSleep =", me.artificialSleep) + log.Log(INFO, "init() me.artificialS =", me.artificialS) + log.Sleep(me.artificialSleep) +} diff --git a/main.go b/main.go index 1c2d8da..c7d9cf5 100644 --- a/main.go +++ b/main.go @@ -35,11 +35,6 @@ func main() { me.ipv4s = make(map[string]dns.RR) me.ipv6s = make(map[string]dns.RR) - if args.TmpLog { - // send all log() output to a file in /tmp - log.SetTmp() - } - me.myGui = gui.New() me.myGui.InitEmbed(resToolkit) me.myGui.Default() -- cgit v1.2.3