websocket: Change connect and logging statements to be more accurate
This commit is contained in:
parent
d2fea57c39
commit
236fb0c4ff
@ -50,6 +50,7 @@ class KlippyWebsocket(threading.Thread):
|
|||||||
# Enable a timeout so that way if moonraker is not running, it will attempt to reconnect
|
# Enable a timeout so that way if moonraker is not running, it will attempt to reconnect
|
||||||
if self.timeout == None:
|
if self.timeout == None:
|
||||||
self.timeout = GLib.timeout_add(500, self.reconnect)
|
self.timeout = GLib.timeout_add(500, self.reconnect)
|
||||||
|
self.connect()
|
||||||
|
|
||||||
def connect (self):
|
def connect (self):
|
||||||
try:
|
try:
|
||||||
@ -125,7 +126,9 @@ class KlippyWebsocket(threading.Thread):
|
|||||||
logging.info("Moonraker Websocket Open")
|
logging.info("Moonraker Websocket Open")
|
||||||
logging.info("Self.connected = %s" % self.is_connected())
|
logging.info("Self.connected = %s" % self.is_connected())
|
||||||
self.connected = True
|
self.connected = True
|
||||||
self.timeout = None
|
if self.timeout != None:
|
||||||
|
GLib.source_remove(self.timeout)
|
||||||
|
self.timeout = None
|
||||||
if "on_connect" in self._callback:
|
if "on_connect" in self._callback:
|
||||||
Gdk.threads_add_idle(
|
Gdk.threads_add_idle(
|
||||||
GLib.PRIORITY_HIGH_IDLE,
|
GLib.PRIORITY_HIGH_IDLE,
|
||||||
@ -155,11 +158,11 @@ class KlippyWebsocket(threading.Thread):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def reconnect(self):
|
def reconnect(self):
|
||||||
logging.debug("Attempting to reconnect")
|
|
||||||
if self.is_connected():
|
if self.is_connected():
|
||||||
logging.debug("Reconnected")
|
logging.debug("Reconnected")
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
logging.debug("Attempting to reconnect")
|
||||||
self.connect()
|
self.connect()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -197,7 +200,7 @@ class MoonrakerApi:
|
|||||||
|
|
||||||
def get_file_list(self, callback=None, *args):
|
def get_file_list(self, callback=None, *args):
|
||||||
#Commenting this log for being too noisy
|
#Commenting this log for being too noisy
|
||||||
#logging.debug("Sending server.files.list")
|
logging.debug("Sending server.files.list")
|
||||||
return self._ws.send_method(
|
return self._ws.send_method(
|
||||||
"server.files.list",
|
"server.files.list",
|
||||||
{},
|
{},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user