From 320b7a88365b2d2b749779436c06b14ff1b8dbd1 Mon Sep 17 00:00:00 2001 From: alfrix Date: Mon, 28 Feb 2022 14:32:35 -0300 Subject: [PATCH] Update websocket-client to 1.3.1 --- ks_includes/KlippyWebsocket.py | 6 +++++- scripts/KlipperScreen-requirements.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ks_includes/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py index 0b5e83f1..582a2777 100644 --- a/ks_includes/KlippyWebsocket.py +++ b/ks_includes/KlippyWebsocket.py @@ -41,6 +41,7 @@ class KlippyWebsocket(threading.Thread): self._callback = callback self.klippy = MoonrakerApi(self) self.closing = False + self.ws = None self._url = "%s:%s" % (host, port) @@ -87,6 +88,8 @@ class KlippyWebsocket(threading.Thread): def close(self): self.closing = True + if self.ws is not None: + self.ws.close() def is_connected(self): return self.connected @@ -155,7 +158,8 @@ class KlippyWebsocket(threading.Thread): if self.closing is True: logging.debug("Closing websocket") - self.ws.close() + self.ws.keep_running = False + self.close() self.closing = False return diff --git a/scripts/KlipperScreen-requirements.txt b/scripts/KlipperScreen-requirements.txt index 74772dc4..192af231 100644 --- a/scripts/KlipperScreen-requirements.txt +++ b/scripts/KlipperScreen-requirements.txt @@ -3,6 +3,6 @@ jinja2==3.0.3 matplotlib==3.5.0 netifaces==0.11.0 requests==2.27.1 -websocket-client==1.2.3 +websocket-client==1.3.1 pycairo==1.20.1 PyGObject==3.42.0