From ee88161808ef1fb1d9e251097194058ec392d7c9 Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Wed, 22 Nov 2023 22:37:35 -0500
Subject: [PATCH] engine: graph, resources: Reduce and clean up logging

Make the output more usable.
---
 engine/graph/actions.go  | 12 ++++++++++--
 engine/graph/engine.go   | 12 ++++++++++--
 engine/resources/dhcp.go |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/engine/graph/actions.go b/engine/graph/actions.go
index 9ddf646d..6ef50fb5 100644
--- a/engine/graph/actions.go
+++ b/engine/graph/actions.go
@@ -338,9 +338,17 @@ func (obj *Engine) Worker(vertex pgraph.Vertex) error {
 				obj.state[vertex].cuid.StopTimer() // clean up nicely
 			} else {
 				obj.state[vertex].cuid.StartTimer()
-				obj.Logf("Watch(%s)", vertex)
+				if obj.Debug {
+					obj.Logf("%s: Watch...", vertex)
+				}
 				err = res.Watch(obj.state[vertex].doneCtx) // run the watch normally
-				obj.Logf("Watch(%s): Exited(%s)", vertex, engineUtil.CleanError(err))
+				if obj.Debug {
+					if s := engineUtil.CleanError(err); err != nil {
+						obj.Logf("%s: Watch Error: %s", vertex, s)
+					} else {
+						obj.Logf("%s: Watch Exited...", vertex)
+					}
+				}
 				obj.state[vertex].cuid.StopTimer() // clean up nicely
 			}
 			if err == nil { // || err == engine.ErrClosed
diff --git a/engine/graph/engine.go b/engine/graph/engine.go
index 82e31564..8bfd87e1 100644
--- a/engine/graph/engine.go
+++ b/engine/graph/engine.go
@@ -253,10 +253,18 @@ func (obj *Engine) Commit() error {
 					obj.wlock.Unlock()
 				}()
 
-				obj.Logf("Worker(%s)", v)
+				if obj.Debug || true {
+					obj.Logf("%s: Working...", v)
+				}
 				// contains the Watch and CheckApply loops
 				err := obj.Worker(v)
-				obj.Logf("Worker(%s): Exited(%s)", v, engineUtil.CleanError(err))
+				if obj.Debug || true {
+					if s := engineUtil.CleanError(err); err != nil {
+						obj.Logf("%s: Error: %s", v, s)
+					} else {
+						obj.Logf("%s: Exited...", v)
+					}
+				}
 				obj.state[v].workerErr = err // store the error
 				// If the Rewatch metaparam is true, then this will get
 				// restarted if we do a graph cmp swap. This is why the
diff --git a/engine/resources/dhcp.go b/engine/resources/dhcp.go
index 6a55cd3e..2655b20c 100644
--- a/engine/resources/dhcp.go
+++ b/engine/resources/dhcp.go
@@ -423,7 +423,7 @@ func (obj *DHCPServerRes) Watch(ctx context.Context) error {
 
 	newLogger := &overEngineeredLogger{
 		logf: func(format string, v ...interface{}) {
-			obj.init.Logf("dhcpv4: "+format, v...)
+			obj.init.Logf(format, v...)
 		},
 	}
 	logOpt := server4.WithLogger(newLogger)