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

rest: add timeout parameter for system update refresh

Browse Source
This commit is contained in:
alfrix 2023-09-03 22:11:28 -03:00
parent e2068cf2c9
commit 001c1cb009
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ks_includes/KlippyRest.py
View File

@ -35,13 +35,13 @@ class KlippyRest:
def get_thumbnail_stream(self, thumbnail):
return self.send_request(f"server/files/gcodes/{thumbnail}", json=False)
def _do_request(self, method, request_method, data=None, json=None, json_response=True):
def _do_request(self, method, request_method, data=None, json=None, json_response=True, timeout=3):
url = f"{self.endpoint}/{method}"
headers = {} if self.api_key is False else {"x-api-key": self.api_key}
response_data = False
try:
callee = getattr(requests, request_method)
response = callee(url, json=json, data=data, headers=headers, timeout=3)
response = callee(url, json=json, data=data, headers=headers, timeout=timeout)
response.raise_for_status()
if json_response:
logging.debug(f"Sending request to {url}")
@ -69,8 +69,8 @@ class KlippyRest:
def post_request(self, method, data=None, json=None, json_response=True):
return self._do_request(method, "post", data, json, json_response)
def send_request(self, method, json=True):
return self._do_request(method, "get", json_response=json)
def send_request(self, method, json=True, timeout=3):
return self._do_request(method, "get", json_response=json, timeout=timeout)
@staticmethod
def format_status(status):

2
panels/system.py
View File

@ -97,7 +97,7 @@ class Panel(ScreenPanel):
GLib.timeout_add_seconds(1, self.get_updates, "true")
def get_updates(self, refresh="false"):
update_resp = self._screen.apiclient.send_request(f"machine/update/status?refresh={refresh}")
update_resp = self._screen.apiclient.send_request(f"machine/update/status?refresh={refresh}", timeout=60)
if not update_resp:
self.update_status = {}
logging.info("No update manager configured")