From b572376f3f5f4d7d36d46126ea14d48925ae09ef Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Sun, 8 Nov 2015 03:07:02 +0900 Subject: [PATCH] Make command log in neutron utils.execute() a single line command execution log from neutron.agent.linux.utils.execute() consists of multiple lines, and the first line has less information and it is hard to analyze logs. Closes-Bug: #1460379 Change-Id: Idca38f26321394596245c9c59b8a9a78c7190423 --- neutron/agent/linux/utils.py | 6 ++++-- neutron/agent/windows/utils.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py index 8d78a7d63..f05df1c30 100644 --- a/neutron/agent/linux/utils.py +++ b/neutron/agent/linux/utils.py @@ -149,9 +149,11 @@ def execute(cmd, process_input=None, addl_env=None, m += _("Stdin: %(stdin)s\n" "Stdout: %(stdout)s\n" "Stderr: %(stderr)s") % command_str - LOG.error(m) + log_msg = m.strip().replace('\n', '; ') + LOG.error(log_msg) else: - LOG.debug(m) + log_msg = m.strip().replace('\n', '; ') + LOG.debug(log_msg) if returncode and check_exit_code: raise RuntimeError(m) diff --git a/neutron/agent/windows/utils.py b/neutron/agent/windows/utils.py index bcbccd3bc..8c44493e0 100644 --- a/neutron/agent/windows/utils.py +++ b/neutron/agent/windows/utils.py @@ -81,10 +81,11 @@ def execute(cmd, process_input=None, addl_env=None, if obj.returncode and obj.returncode in extra_ok_codes: obj.returncode = None + log_msg = m.strip().replace('\n', '; ') if obj.returncode and log_fail_as_error: - LOG.error(m) + LOG.error(log_msg) else: - LOG.debug(m) + LOG.debug(log_msg) if obj.returncode and check_exit_code: raise RuntimeError(m) -- 2.45.2