Richie/dotfiles
1
0
Fork 0
mirror of https://github.com/RichieCahill/dotfiles.git synced 2026-04-17 04:58:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed most ruff error

Browse Source
This commit is contained in:
Richie Cahill
2025-10-30 19:41:43 -04:00
parent 65fca5c8a4
commit 6a09bc66b6
11 changed files with 99 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/system_tests/components.py
View File

@@ -14,6 +14,8 @@ from python.zfs import Zpool
if TYPE_CHECKING:
from collections.abc import Sequence
logger = logging.getLogger(__name__)
def zpool_tests(pool_names: Sequence[str], zpool_capacity_threshold: int = 90) -> list[str] | None:
"""Check the zpool health and capacity.
@@ -25,7 +27,7 @@ def zpool_tests(pool_names: Sequence[str], zpool_capacity_threshold: int = 90) -
Returns:
list[str] | None: A list of errors if any.
"""
logging.info("Testing zpool")
logger.info("Testing zpool")
errors: list[str] = []
for pool_name in pool_names:
@@ -63,7 +65,7 @@ def systemd_tests(
Returns:
list[str] | None: A list of errors if any.
"""
logging.info("Testing systemd service")
logger.info("Testing systemd service")
max_retries = max(max_retries, 1)
retry_delay_secs = max(retry_delay_secs, 1)
@@ -81,7 +83,7 @@ def systemd_tests(
for retry in range(max_retries):
if not service_names_set:
break
logging.info(f"Testing systemd service in {retry + 1} of {max_retries}")
logger.info(f"Testing systemd service in {retry + 1} of {max_retries}")
service_names_to_test = copy(service_names_set)
for service_name in service_names_to_test:
service_status, _ = bash_wrapper(f"systemctl is-active {service_name}")

10
python/system_tests/validate_system.py
View File

@@ -12,6 +12,8 @@ import typer
from python.common import configure_logger, signal_alert
from python.system_tests.components import systemd_tests, zpool_tests
logger = logging.getLogger(__name__)
def load_config_data(config_file: Path) -> dict[str, list[str]]:
"""Load a TOML configuration file.
@@ -30,7 +32,7 @@ def main(config_file: Path) -> None:
configure_logger(level=environ.get("LOG_LEVEL", "INFO"))
server_name = gethostname()
logging.info(f"Starting {server_name} validation")
logger.info(f"Starting {server_name} validation")
config_data = load_config_data(config_file)
@@ -43,16 +45,16 @@ def main(config_file: Path) -> None:
errors.extend(systemd_errors)
except Exception as error:
logging.exception(f"{server_name} validation failed")
logger.exception(f"{server_name} validation failed")
errors.append(f"{server_name} validation failed: {error}")
if errors:
logging.error(f"{server_name} validation failed: \n{'\n'.join(errors)}")
logger.error(f"{server_name} validation failed: \n{'\n'.join(errors)}")
signal_alert(f"{server_name} validation failed {errors}")
sys.exit(1)
logging.info(f"{server_name} validation passed")
logger.info(f"{server_name} validation passed")
def cli() -> None: