3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_manager: improve web client error handling 

Singed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-10-19 17:58:58 -04:00
parent 38b035389d
commit c7e290a3cd
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonraker/components/update_manager/update_manager.py
View File

@ -1176,6 +1176,7 @@ class WebClientDeploy(BaseDeploy):
storage = await super().initialize() storage = await super().initialize()
self.version: str = storage.get('version', "?") self.version: str = storage.get('version', "?")
self.remote_version: str = storage.get('remote_version', "?") self.remote_version: str = storage.get('remote_version', "?")
self.last_error: str = storage.get('last_error', "")
dl_info: List[Any] = storage.get('dl_info', ["?", "?", 0]) dl_info: List[Any] = storage.get('dl_info', ["?", "?", 0])
self.dl_info: Tuple[str, str, int] = cast( self.dl_info: Tuple[str, str, int] = cast(
Tuple[str, str, int], tuple(dl_info)) Tuple[str, str, int], tuple(dl_info))
@ -1208,7 +1209,9 @@ class WebClientDeploy(BaseDeploy):
else: else:
resource = f"repos/{self.repo}/releases?per_page=1" resource = f"repos/{self.repo}/releases?per_page=1"
client = self.cmd_helper.get_http_client() client = self.cmd_helper.get_http_client()
resp = await client.github_api_request(resource, attempts=3) resp = await client.github_api_request(
resource, attempts=3, retry_pause_time=.5
)
release: Union[List[Any], Dict[str, Any]] = {} release: Union[List[Any], Dict[str, Any]] = {}
if resp.status_code == 304: if resp.status_code == 304:
if self.remote_version == "?" and resp.content: if self.remote_version == "?" and resp.content:
@ -1221,6 +1224,8 @@ class WebClientDeploy(BaseDeploy):
elif resp.has_error(): elif resp.has_error():
logging.info( logging.info(
f"Client {self.repo}: Github Request Error - {resp.error}") f"Client {self.repo}: Github Request Error - {resp.error}")
self.last_error = str(resp.error)
return
else: else:
release = resp.json() release = resp.json()
result: Dict[str, Any] = {} result: Dict[str, Any] = {}
@ -1229,6 +1234,7 @@ class WebClientDeploy(BaseDeploy):
result = release[0] result = release[0]
else: else:
result = release result = release
self.last_error = ""
self.remote_version = result.get('name', "?") self.remote_version = result.get('name', "?")
release_asset: Dict[str, Any] = result.get('assets', [{}])[0] release_asset: Dict[str, Any] = result.get('assets', [{}])[0]
dl_url: str = release_asset.get('browser_download_url', "?") dl_url: str = release_asset.get('browser_download_url', "?")
@ -1249,6 +1255,7 @@ class WebClientDeploy(BaseDeploy):
storage['version'] = self.version storage['version'] = self.version
storage['remote_version'] = self.remote_version storage['remote_version'] = self.remote_version
storage['dl_info'] = list(self.dl_info) storage['dl_info'] = list(self.dl_info)
storage['last_error'] = self.last_error
return storage return storage
async def update(self) -> bool: async def update(self) -> bool:
@ -1328,7 +1335,8 @@ class WebClientDeploy(BaseDeploy):
'remote_version': self.remote_version, 'remote_version': self.remote_version,
'configured_type': self.type, 'configured_type': self.type,
'channel': self.channel, 'channel': self.channel,
'info_tags': self.info_tags 'info_tags': self.info_tags,
'last_error': self.last_error
} }
def load_component(config: ConfigHelper) -> UpdateManager: def load_component(config: ConfigHelper) -> UpdateManager: