Display hardware info in footer; close open file handlers; better error handling (#989)

* Expose hardware info in env string

* Improve error handling for get_properties_by_drive_name

* Verbose uname parameters.

* Close open file in introspect method

* Add error handling for when no drive name was matched with props in the database
This commit is contained in:
Daniel Markstedt
2022-11-15 22:28:27 -08:00
committed by GitHub
parent 3627b39af4
commit 4645e8c975
4 changed files with 78 additions and 34 deletions

View File

@@ -189,19 +189,19 @@ def get_properties_by_drive_name(drives, drive_name):
"""
drives.sort(key=lambda item: item.get("name"))
drive_props = None
for drive in drives:
if drive["name"] == drive_name:
drive_props = drive
return {
"file_type": drive["file_type"],
"vendor": drive["vendor"],
"product": drive["product"],
"revision": drive["revision"],
"block_size": drive["block_size"],
"size": drive["size"],
}
return {
"file_type": drive_props["file_type"],
"vendor": drive_props["vendor"],
"product": drive_props["product"],
"revision": drive_props["revision"],
"block_size": drive_props["block_size"],
"size": drive_props["size"],
}
logging.error("Properties for drive '%s' does not exist in database", drive_name)
return False
def auth_active(group):
"""