From 1ca11f1fe75b081704763cb5a10afff35e2a7239 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 12 Jan 2025 09:27:35 +0100 Subject: [PATCH] statd: yanger: ignore 'podman' errors when built without containers - Avoid unnecessary error messages in syslog when build w/o containers - Simplify log messages slightly Signed-off-by: Joachim Wiberg --- src/statd/python/yanger/infix_containers.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/statd/python/yanger/infix_containers.py b/src/statd/python/yanger/infix_containers.py index 4289fb85..8ef96e77 100644 --- a/src/statd/python/yanger/infix_containers.py +++ b/src/statd/python/yanger/infix_containers.py @@ -1,18 +1,23 @@ from .common import LOG from .host import HOST + +# Catch errors (check=True), at this point we've run 'podman ps' (below) def podman_inspect(name): """Call podman inspect {name}, return object at {path} or None.""" cmd = ['podman', 'inspect', name] try: return HOST.run_json(cmd, default=[]) except Exception as e: - LOG(f"Error running podman inspect: {e}") + LOG.error(f"failed podman inspect: {e}") return [] + +# Ignore any errors here, may be called on a build without containers def podman_ps(): """We list *all* containers, not just those in the configuraion.""" - return HOST.run_json("podman ps -a --format=json".split(), default=[]) + cmd = ['podman', 'ps', '-a', '--format=json'] + return HOST.run_json(cmd, default=[]) def network(ps, inspect):