CreatBot/CreatBotMoonraker
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_manager: resolve initialization issues

Browse Source 
Fix issue where apt-get update is called on startup.  This should only be done by the "auto updater" or by a specific request to refresh.

Always set an Updater's init event to true when refresh() is called, regardless of the result.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-01-26 17:47:10 -05:00
parent 25b3911d3d
commit ddc7405249
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moonraker/plugins/update_manager.py
View File

@ -127,7 +127,7 @@ class UpdateManager:
else: else:
ret = updater.refresh() ret = updater.refresh()
if asyncio.iscoroutine(ret): if asyncio.iscoroutine(ret):
await updater.refresh() await ret
self.is_refreshing = False self.is_refreshing = False
async def _set_klipper_repo(self): async def _set_klipper_repo(self):
@ -515,8 +515,7 @@ class GitUpdater:
await self._check_version() await self._check_version()
except Exception: except Exception:
logging.exception("Error Refreshing git state") logging.exception("Error Refreshing git state")
else: self.init_evt.set()
self.init_evt.set()
self.refresh_condition.notify_all() self.refresh_condition.notify_all()
self.refresh_condition = None self.refresh_condition = None
@ -781,9 +780,10 @@ class PackageUpdater:
return return
try: try:
if fetch_packages: if fetch_packages:
await self.execute_cmd(f"{APT_CMD} update", timeout=300.) await self.execute_cmd(
f"{APT_CMD} update", timeout=300., retries=3)
res = await self.execute_cmd_with_response( res = await self.execute_cmd_with_response(
"apt list --upgradable") "apt list --upgradable", timeout=60.)
pkg_list = [p.strip() for p in res.split("\n") if p.strip()] pkg_list = [p.strip() for p in res.split("\n") if p.strip()]
if pkg_list: if pkg_list:
pkg_list = pkg_list[2:] pkg_list = pkg_list[2:]
@ -795,8 +795,7 @@ class PackageUpdater:
f"\n{pkg_list}") f"\n{pkg_list}")
except Exception: except Exception:
logging.exception("Error Refreshing System Packages") logging.exception("Error Refreshing System Packages")
else: self.init_evt.set()
self.init_evt.set()
self.refresh_condition.notify_all() self.refresh_condition.notify_all()
self.refresh_condition = None self.refresh_condition = None
@ -874,8 +873,7 @@ class WebUpdater:
await self._get_remote_version() await self._get_remote_version()
except Exception: except Exception:
logging.exception("Error Refreshing Client") logging.exception("Error Refreshing Client")
else: self.init_evt.set()
self.init_evt.set()
self.refresh_condition.notify_all() self.refresh_condition.notify_all()
self.refresh_condition = None self.refresh_condition = None