CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

Websocket: fix issue when trying to connect to an offline printer

Browse Source 
Fix: #401
This commit is contained in:
alfrix 2022-02-23 23:18:38 -03:00
parent 21be9df72e
commit be3c24198d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ks_includes/KlippyWebsocket.py
View File

@ -47,7 +47,7 @@ class KlippyWebsocket(threading.Thread):
def initial_connect(self): def initial_connect(self):
# 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 is None: if self.timeout is None:
self.timeout = GLib.timeout_add(500, self.reconnect) self.timeout = GLib.timeout_add_seconds(1, self.reconnect)
self.connect() self.connect()
def connect(self): def connect(self):
@ -79,8 +79,7 @@ class KlippyWebsocket(threading.Thread):
self.ws = websocket.WebSocketApp( self.ws = websocket.WebSocketApp(
self.ws_url, on_close=ws_on_close, on_error=ws_on_error, on_message=ws_on_message, on_open=ws_on_open) self.ws_url, on_close=ws_on_close, on_error=ws_on_error, on_message=ws_on_message, on_open=ws_on_open)
self._wst = threading.Thread(target=self.ws.run_forever) self._wst = threading.Thread(target=self.ws.run_forever, daemon=True)
self._wst.daemon = True
try: try:
self._wst.start() self._wst.start()
except Exception: except Exception:
@ -88,7 +87,6 @@ class KlippyWebsocket(threading.Thread):
def close(self): def close(self):
self.closing = True self.closing = True
self.ws.close()
def is_connected(self): def is_connected(self):
return self.connected return self.connected
@ -150,17 +148,21 @@ class KlippyWebsocket(threading.Thread):
def on_close(self, ws): def on_close(self, ws):
if self.is_connected() is False: if self.is_connected() is False:
logging.debug("Connection already closed") logging.debug("Connection already closed")
if self.timeout is not None:
GLib.source_remove(self.timeout)
self.timeout = None
return return
if self.closing is True: if self.closing is True:
logging.debug("Closing websocket") logging.debug("Closing websocket")
self.ws.close() self.ws.close()
self.closing = False
return return
logging.info("Moonraker Websocket Closed") logging.info("Moonraker Websocket Closed")
self.connected = False self.connected = False
if self.timeout is None: if self.timeout is None:
self.timeout = GLib.timeout_add(500, self.reconnect) self.timeout = GLib.timeout_add_seconds(1, self.reconnect)
if "on_close" in self._callback: if "on_close" in self._callback:
Gdk.threads_add_idle( Gdk.threads_add_idle(