added additional logging, added calls to Fatal() when switch case is unknown

6 files changed, 49 insertions, 7 deletions

diff --git a/ui/PrintStatusPanel.go b/ui/PrintStatusPanel.go
index 6c1a47e..748ad92 100755
--- a/ui/PrintStatusPanel.go
+++ b/ui/PrintStatusPanel.go
@@ -281,6 +281,11 @@ func (this *printStatusPanel) doUpdateState(printerState *octoprint.PrinterState
 			this.completeButton.Show()
 
 		default:
+			logLevel := utils.LowerCaseLogLevel()
+			if logLevel == "debug" {
+				utils.Logger.Fatalf("PrintStatusPanel.doUpdateState() - unknown printerState.Flags")
+			}
+
 			this.pauseButton.SetSensitive(false)
 			this.stopButton.SetSensitive(false)
 	}
diff --git a/ui/menu.go b/ui/menu.go
index be8ef45..e2d74c6 100755
--- a/ui/menu.go
+++ b/ui/menu.go
@@ -77,6 +77,11 @@ func getPanel(
 			return PrintMenuPanel(ui, parentPanel)
 
 		default:
+			logLevel := utils.LowerCaseLogLevel()
+			if logLevel == "debug" {
+				utils.Logger.Fatalf("menu.getPanel() - unknown menuItem.Panel: %q", menuItem.Panel)
+			}
+
 			return nil
 	}
 }
diff --git a/ui/ui.go b/ui/ui.go
index 4674f82..b2b397e 100755
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -193,7 +193,10 @@ func (this *UI) verifyConnection() {
 						newUIState = "idle"
 
 					default:
-						utils.Logger.Fatalf("ui.verifyConnection() - unknown switch of s.Current.State: %q", strCurrentState)
+						logLevel := utils.LowerCaseLogLevel()
+						if logLevel == "debug" {
+							utils.Logger.Fatalf("menu.getPanel() - unknown CurrentState: %q", strCurrentState)
+						}
 				}
 		}
 	} else {
@@ -249,7 +252,10 @@ func (this *UI) verifyConnection() {
 			this.GoToPanel(this.splashPanel)
 
 		default:
-			utils.Logger.Fatalf("ui.verifyConnection() - unknown switch of newUIState: %q", newUIState)
+			logLevel := utils.LowerCaseLogLevel()
+			if logLevel == "debug" {
+				utils.Logger.Fatalf("ui.verifyConnection() - unknown switch of newUIState: %q", newUIState)
+			}
 	}
 
 	utils.Logger.Debug("leaving ui.verifyConnection()")
diff --git a/uiWidgets/SystemInformationInfoBox.go b/uiWidgets/SystemInformationInfoBox.go
index f8f325a..2f5e0cd 100755
--- a/uiWidgets/SystemInformationInfoBox.go
+++ b/uiWidgets/SystemInformationInfoBox.go
@@ -3,7 +3,7 @@ package uiWidgets
 import (
 	"fmt"
 	"os"
-	"strings"
+	// "strings"
 
 	"github.com/dustin/go-humanize"
 	"github.com/gotk3/gotk3/gtk"
@@ -56,11 +56,10 @@ func CreateSystemInformationInfoBox(
 
 
 
-	logLevel := os.Getenv(utils.EnvLogLevel)
+	logLevel := utils.LowerCaseLogLevel()
 	if logLevel == "" {
-		logLevel = "debug"
-	} else {
-		logLevel = strings.ToLower(logLevel)
+		// If not set, default to warning level.
+		logLevel = "warn"
 	}
 
 	if logLevel == "debug" {
diff --git a/utils/logger.go b/utils/logger.go
index b6978ca..8dce953 100755
--- a/utils/logger.go
+++ b/utils/logger.go
@@ -45,6 +45,12 @@ func SetLogLevel(level logrus.Level) {
 	standardLog.Printf("logger.SetLogLevel() - the log level is now set to: %q", level)
 }
 
+func LowerCaseLogLevel() string {
+	logLevel := os.Getenv(EnvLogLevel)
+	return strings.ToLower(logLevel)
+}
+
+
 func init() {
 	log = logrus.New()
 	log.AddHook(ContextHook{})
diff --git a/utils/tools.go b/utils/tools.go
index 378617d..f01e636 100755
--- a/utils/tools.go
+++ b/utils/tools.go
@@ -72,45 +72,63 @@ func GetDisplayNameForTool(toolName string) string {
 
 
 func GetToolTarget(client *octoprint.Client, tool string) (float64, error) {
+	Logger.Debug("entering Tools.GetToolTarget()")
+
+
 	fullStateRequest, err := (&octoprint.FullStateRequest{
 		Exclude: []string{"sd", "state"},
 	}).Do(client)
 
 	if err != nil {
 		LogError("tools.GetToolTarget()", "Do(StateRequest)", err)
+
+		Logger.Debug("leaving Tools.GetToolTarget()")
 		return -1, err
 	}
 
 	currentTemperatureData, ok := fullStateRequest.Temperature.CurrentTemperatureData[tool]
 	if !ok {
+		Logger.Debug("leaving Tools.GetToolTarget()")
 		return -1, fmt.Errorf("unable to find tool %q", tool)
 	}
 
+	Logger.Debug("leaving Tools.GetToolTarget()")
 	return currentTemperatureData.Target, nil
 }
 
 
 func SetToolTarget(client *octoprint.Client, tool string, target float64) error {
+	Logger.Debug("entering Tools.SetToolTarget()")
+
 	if tool == "bed" {
 		cmd := &octoprint.BedTargetRequest{Target: target}
+
+		Logger.Debug("leaving Tools.SetToolTarget()")
 		return cmd.Do(client)
 	}
 
 	cmd := &octoprint.ToolTargetRequest{Targets: map[string]float64{tool: target}}
 
+	Logger.Debug("leaving Tools.SetToolTarget()")
 	return cmd.Do(client)
 }
 
 
 func GetCurrentTemperatureData(client *octoprint.Client) (map[string]octoprint.TemperatureData, error) {
+	Logger.Debug("entering Tools.GetCurrentTemperatureData()")
+
 	temperatureDataResponse, err := (&octoprint.TemperatureDataRequest{}).Do(client)
 	if err != nil {
 		LogError("tools.GetCurrentTemperatureData()", "Do(TemperatureDataRequest)", err)
+
+		Logger.Debug("leaving Tools.GetCurrentTemperatureData()")
 		return nil, err
 	}
 
 	if temperatureDataResponse == nil {
 		Logger.Error("tools.GetCurrentTemperatureData() - temperatureDataResponse is nil")
+
+		Logger.Debug("leaving Tools.GetCurrentTemperatureData()")
 		return nil, err
 	}
 
@@ -118,9 +136,12 @@ func GetCurrentTemperatureData(client *octoprint.Client) (map[string]octoprint.T
 
 	if temperatureDataResponse.TemperatureStateResponse.CurrentTemperatureData == nil {
 		Logger.Error("tools.GetCurrentTemperatureData() - temperatureDataResponse.TemperatureStateResponse.CurrentTemperatureData is nil")
+
+		Logger.Debug("leaving Tools.GetCurrentTemperatureData()")
 		return nil, err
 	}
 
+	Logger.Debug("leaving Tools.GetCurrentTemperatureData()")
 	return temperatureDataResponse.TemperatureStateResponse.CurrentTemperatureData, nil
 }