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

update_manager: report errors in update response 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-10-20 10:57:02 -04:00
parent e4a670a380
commit 59cc8c6c7b
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moonraker/components/update_manager/git_deploy.py
View File

@ -159,7 +159,7 @@ class GitDeploy(AppDeploy):
await self.repo.reset() await self.repo.reset()
else: else:
await self.repo.pull() await self.repo.pull()
except Exception: except Exception as e:
if self.repo.repo_corrupt: if self.repo.repo_corrupt:
self._is_valid = False self._is_valid = False
self._save_state() self._save_state()
@ -167,7 +167,7 @@ class GitDeploy(AppDeploy):
event_loop.delay_callback( event_loop.delay_callback(
.2, self.cmd_helper.notify_update_refreshed .2, self.cmd_helper.notify_update_refreshed
) )
raise self.log_exc("Error updating git repo") raise self.log_exc(str(e))
async def _update_dependencies(self, async def _update_dependencies(self,
inst_hash: Optional[str], inst_hash: Optional[str],

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

@ -285,9 +285,7 @@ class UpdateManager:
await updater.update() await updater.update()
except Exception as e: except Exception as e:
self.cmd_helper.notify_update_response( self.cmd_helper.notify_update_response(
f"Error updating {app}") f"Error updating {app}: {e}", is_complete=True)
self.cmd_helper.notify_update_response(
str(e), is_complete=True)
raise raise
finally: finally:
self.cmd_helper.clear_update_info() self.cmd_helper.clear_update_info()
@ -352,11 +350,9 @@ class UpdateManager:
self.cmd_helper.notify_update_response( self.cmd_helper.notify_update_response(
"Full Update Complete", is_complete=True) "Full Update Complete", is_complete=True)
except Exception as e: except Exception as e:
self.cmd_helper.notify_update_response(
f"Error updating {app_name}")
self.cmd_helper.set_full_complete(True) self.cmd_helper.set_full_complete(True)
self.cmd_helper.notify_update_response( self.cmd_helper.notify_update_response(
str(e), is_complete=True) f"Error updating {app_name}: {e}", is_complete=True)
finally: finally:
self.cmd_helper.clear_update_info() self.cmd_helper.clear_update_info()
return "ok" return "ok"