From 14dfb27d6b014b7707e6c153e29e72776726b975 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Mon, 22 Mar 2021 15:00:13 +0300 Subject: [PATCH] Improve logs --- tagging/docker_runner.py | 5 +++-- tagging/taggers.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tagging/docker_runner.py b/tagging/docker_runner.py index b6edb03b..9b0302cb 100644 --- a/tagging/docker_runner.py +++ b/tagging/docker_runner.py @@ -29,10 +29,11 @@ class DockerRunner: logger.info(f"Container {self.container.name} removed") -def run_simple_command(container, cmd): +def run_simple_command(container, cmd, print_result=True): logger.info(f"Running cmd: '{cmd}' on container: {container}") out = container.exec_run(cmd) assert out.exit_code == 0, f"Command: {cmd} failed" result = out.output.decode("utf-8").strip() - logger.info(f"Command result: {result}") + if print_result: + logger.info(f"Command result: {result}") return result diff --git a/tagging/taggers.py b/tagging/taggers.py index 03351025..f57282fb 100644 --- a/tagging/taggers.py +++ b/tagging/taggers.py @@ -9,11 +9,11 @@ logger = logging.getLogger(__name__) def _get_program_version(container, program): - return run_simple_command(container, f"{program} --version") + return run_simple_command(container, cmd=f"{program} --version") def _get_env_variable(container, variable): - env = run_simple_command(container, "env").split() + env = run_simple_command(container, cmd="env", print_result=False).split() for env_entry in env: if env_entry.startswith(variable): return env_entry[len(variable) + 1:]