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

update_manager: improve package manager logging 

Assign a custom prefix for the configured provider.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-07-10 10:57:47 -04:00
parent 01141fa10e
commit 4443bfbd41
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,7 +680,8 @@ class PackageDeploy(BaseDeploy):
except Exception: except Exception:
pass pass
else: else:
logging.info("PackageDeploy: Using PackageKit Provider") self.log_info("PackageDeploy: PackageKit Provider Configured")
self.prefix = "PackageKit: "
try_fallback = False try_fallback = False
if try_fallback: if try_fallback:
# Check to see of the apt command is available # Check to see of the apt command is available
@ -694,7 +695,8 @@ class PackageDeploy(BaseDeploy):
"Unable to initialize System Update Provider for " "Unable to initialize System Update Provider for "
f"distribution: {dist_id}") f"distribution: {dist_id}")
else: else:
logging.info("PackageDeploy: Using APT CLI Provider") self.log_info("PackageDeploy: Using APT CLI Provider")
self.prefix = "Package Manager APT: "
provider = fallback provider = fallback
self.provider = provider self.provider = provider
return storage return storage
@ -709,7 +711,7 @@ class PackageDeploy(BaseDeploy):
except shell_cmd.error: except shell_cmd.error:
return None return None
# APT Command found should be available # APT Command found should be available
logging.debug(f"APT package manager detected: {ret}") self.log_debug(f"APT package manager detected: {ret}")
provider = AptCliProvider(self.cmd_helper) provider = AptCliProvider(self.cmd_helper)
try: try:
await provider.initialize() await provider.initialize()
@ -724,11 +726,12 @@ class PackageDeploy(BaseDeploy):
await self._update_package_cache(force=True) await self._update_package_cache(force=True)
self.available_packages = await self.provider.get_packages() self.available_packages = await self.provider.get_packages()
pkg_msg = "\n".join(self.available_packages) pkg_msg = "\n".join(self.available_packages)
logging.info( self.log_info(
f"Detected {len(self.available_packages)} package updates:" f"Detected {len(self.available_packages)} package updates:"
f"\n{pkg_msg}") f"\n{pkg_msg}"
)
except Exception: except Exception:
logging.exception("Error Refreshing System Packages") self.log_exc("Error Refreshing System Packages")
# Update Persistent Storage # Update Persistent Storage
self._save_state() self._save_state()