From adeea2f080d02eb4298500de89fd4926f1d3a7a7 Mon Sep 17 00:00:00 2001 From: Joshua Kreuder Date: Wed, 22 Nov 2023 13:12:11 +0100 Subject: [PATCH] [IMP] run_cmd logging --- src/godoo_cli/commands/backup/load.py | 2 +- src/godoo_cli/helpers/system.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/godoo_cli/commands/backup/load.py b/src/godoo_cli/commands/backup/load.py index f194fb6..07ffb2f 100644 --- a/src/godoo_cli/commands/backup/load.py +++ b/src/godoo_cli/commands/backup/load.py @@ -49,11 +49,11 @@ def load_pg_dump( command = "cat %s | psql {} >/dev/null" % dump_path load_return = conn.run_psql_shell_command( command=command, - log_name="Reading DB", text=True, capture_output=True, ) if load_return.returncode != 0: + LOGGER.error("Failed to load DB Dump: %s", load_return.stderr) raise typer.Exit(1) LOGGER.info("Deleting RPC Import Cache using plain SQL") with conn.connect() as cur: diff --git a/src/godoo_cli/helpers/system.py b/src/godoo_cli/helpers/system.py index d665776..2806154 100644 --- a/src/godoo_cli/helpers/system.py +++ b/src/godoo_cli/helpers/system.py @@ -19,7 +19,7 @@ LOGGER = logging.getLogger(__name__) -def run_cmd(command: str, log_name: str = "", **kwargs) -> subprocess.CompletedProcess: +def run_cmd(command: str, **kwargs) -> subprocess.CompletedProcess: """Runs command via subprocess.run Parameters @@ -37,8 +37,7 @@ def run_cmd(command: str, log_name: str = "", **kwargs) -> subprocess.CompletedP if not kwargs.get("shell"): kwargs["shell"] = True proc = subprocess.run(command, **kwargs) - if proc.returncode != 0 and log_name: - LOGGER.error("Failed: %s", log_name) + LOGGER.debug("Return Code: %s", proc.returncode) return proc