use internal log flagsv0.20.1

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 13 insertions, 9 deletions

diff --git a/plugin.go b/plugin.go
index d9473f3..b387fd1 100644
--- a/plugin.go
+++ b/plugin.go
@@ -57,7 +57,7 @@ func initPlugin(name string) *aplug {
 	for _, aplug := range allPlugins {
 		log.Log(PLUG, "initPlugin() already loaded toolkit plugin =", aplug.name)
 		if aplug.name == name {
-			log.Warn("initPlugin() SKIPPING", name, "as you can't load it twice")
+			log.Log(WARN, "initPlugin() SKIPPING", name, "as you can't load it twice")
 			return nil
 		}
 	}
@@ -92,7 +92,8 @@ func sendCallback(p *aplug, funcName string) func(chan widget.Action) {
 
 	test, err = p.plug.Lookup(funcName)
 	if err != nil {
-		log.Error(err, "DID NOT FIND: name =", test)
+		log.Log(WARN, "sendCallback() err =", err)
+		log.Log(WARN, "sendCallback() DID NOT FIND: name =", funcName)
 		return nil
 	}
 
@@ -123,7 +124,8 @@ func searchPaths(name string) *aplug {
 	pfile, err = me.resFS.ReadFile(filename)
 	if err == nil {
 		filename = "/tmp/" + name + ".so"
-		log.Error(err, "write out file here", name, filename, len(pfile))
+		log.Log(WARN, "searchPaths() using toolkit embedded in executable")
+		log.Log(WARN, "searchPaths() resource file", name, filename, len(pfile))
 		f, _ := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE, 0600)
 		f.Write(pfile)
 		f.Close()
@@ -132,7 +134,7 @@ func searchPaths(name string) *aplug {
 			return p
 		}
 	} else {
-		log.Error(err, filename, "was not embedded in the binary")
+		log.Log(INFO, "searchPaths()", filename, "was not embedded in the binary")
 	}
 
 	// attempt to write out the file from the internal resource
@@ -185,11 +187,13 @@ func initToolkit(name string, filename string) *aplug {
 		}
 	}
 	log.Log(PLUG, "initToolkit() Found plugin", name, "as filename", filename)
-	log.Verbose("initToolkit() Verbose Found plugin", name, "as filename", filename)
 
 	plug, err := plugin.Open(filename)
 	if err != nil {
-		log.Error(err, "initToolkit() plugin FAILED =", filename)
+		// turn on PLUG debugging if something goes wrong
+		PLUG.SetBool(true)
+		log.Log(PLUG, "plugin.Open() err =", err)
+		log.Log(PLUG, "initToolkit() FAILED =", filename)
 		return nil
 	}
 	log.Log(PLUG, "initToolkit() SUCCESS loading plugin =", filename)
@@ -214,7 +218,7 @@ func initToolkit(name string, filename string) *aplug {
 	// set the communication to the plugins
 	newPlug.pluginChan = newPlug.PluginChannel()
 	if newPlug.pluginChan == nil {
-		log.Warn("initToolkit() ERROR PluginChannel() returned nil for plugin:", newPlug.name, filename)
+		log.Log(WARN, "initToolkit() ERROR PluginChannel() returned nil for plugin:", newPlug.name, filename)
 		return nil
 	}
 	newPlug.Callback(me.guiChan)
@@ -247,14 +251,14 @@ func (n *Node) LoadToolkitEmbed(name string, b []byte) *Node {
 
 	p := initToolkit(name, f.Name())
 	if p == nil {
-		log.Warn("LoadToolkitEmbed() embedded go file failed", name)
+		log.Log(WARN, "LoadToolkitEmbed() embedded go file failed", name)
 	}
 	return n
 }
 
 func (n *Node) ListToolkits() {
 	for _, aplug := range allPlugins {
-		log.Info("ListToolkits() already loaded toolkit plugin =", aplug.name)
+		log.Log(WARN, "ListToolkits() already loaded toolkit plugin =", aplug.name)
 	}
 }