Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Z-Bolt/OctoScreen.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffB42 <10328858+JeffB42@users.noreply.github.com>2021-02-21 22:35:01 +0300
committerJeffB42 <10328858+JeffB42@users.noreply.github.com>2021-02-21 22:35:01 +0300
commit0242f95113663edf58b49589d3c47aba425ebe07 (patch)
tree34d4eec47b13b15546ed033ff77bbe5baa23748f
parent55960bb55fe5dd6fb699d0ab86720cfed09da120 (diff)
added more logging to ui.go
-rwxr-xr-xui/ui.go23
1 files changed, 23 insertions, 0 deletions
diff --git a/ui/ui.go b/ui/ui.go
index 021f205..4a3bac6 100755
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -163,6 +163,14 @@ func (this *UI) verifyConnection() {
connectionResponse, err := (&octoprintApis.ConnectionRequest{}).Do(this.Client)
if err == nil {
+ utils.Logger.Debug("ui.verifyConnection() - ConnectionRequest.Do() succeeded")
+ jsonResponse, err := utils.StructToJson(connectionResponse)
+ if err != nil {
+ utils.Logger.Debug("ui.verifyConnection() - utils.StructToJson() failed")
+ } else {
+ utils.Logger.Debug("ui.verifyConnection() - connectionResponse is: %s", jsonResponse)
+ }
+
this.ConnectionState = connectionResponse.Current.State
newUIState, splashMessage = this.getUiStateAndMessageFromConnectionResponse(connectionResponse, newUIState, splashMessage)
} else {
@@ -185,20 +193,27 @@ func (this *UI) getUiStateAndMessageFromConnectionResponse(
newUIState string,
splashMessage string,
) (string, string) {
+ utils.Logger.Debug("entering ui.getUiStateAndMessageFromConnectionResponse()")
+
strCurrentState := string(connectionResponse.Current.State)
+ utils.Logger.Debugf("ui.getUiStateAndMessageFromConnectionResponse() - strCurrentState is %s", strCurrentState)
switch {
case connectionResponse.Current.State.IsOperational():
+ utils.Logger.Debug("ui.getUiStateAndMessageFromConnectionResponse() - new state is idle")
newUIState = "idle"
splashMessage = "Initializing..."
case connectionResponse.Current.State.IsPrinting():
+ utils.Logger.Debug("ui.getUiStateAndMessageFromConnectionResponse() - new state is printing")
newUIState = "printing"
splashMessage = "Printing..."
case connectionResponse.Current.State.IsError():
+ utils.Logger.Debug("ui.getUiStateAndMessageFromConnectionResponse() - the state has an error")
fallthrough
case connectionResponse.Current.State.IsOffline():
+ utils.Logger.Debug("ui.getUiStateAndMessageFromConnectionResponse() - the state is now offline and displaying the splash panel")
newUIState = "splash"
utils.Logger.Info("ui.getUiStateAndMessageFromConnectionResponse() - new UI state is 'splash' and is about to call ConnectRequest.Do()")
if err := (&octoprintApis.ConnectRequest{}).Do(this.Client); err != nil {
@@ -209,10 +224,12 @@ func (this *UI) getUiStateAndMessageFromConnectionResponse(
}
case connectionResponse.Current.State.IsConnecting():
+ utils.Logger.Debug("ui.getUiStateAndMessageFromConnectionResponse() - new state is splash (from IsConnecting)")
newUIState = "splash"
splashMessage = strCurrentState
default:
+ utils.Logger.Debug("ui.getUiStateAndMessageFromConnectionResponse() - the default case was hit")
switch strCurrentState {
case "Cancelling":
newUIState = "idle"
@@ -222,6 +239,8 @@ func (this *UI) getUiStateAndMessageFromConnectionResponse(
}
}
+ utils.Logger.Debug("leaving ui.getUiStateAndMessageFromConnectionResponse()")
+
return newUIState, splashMessage
}
@@ -231,6 +250,8 @@ func (this *UI) getUiStateAndMessageFromError(
newUIState string,
splashMessage string,
) (string, string) {
+ utils.Logger.Debug("entering ui.getUiStateAndMessageFromError()")
+
utils.Logger.Info("ui.getUiStateAndMessageFromError() - now setting newUIState to 'splash'")
newUIState = "splash"
@@ -253,6 +274,8 @@ func (this *UI) getUiStateAndMessageFromError(
splashMessage = "Printer is offline! (retrying to connect...)"
}
+ utils.Logger.Debug("leaving ui.getUiStateAndMessageFromError()")
+
return newUIState, splashMessage
}