summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-02-18 03:15:12 +0000
committerGerrit Code Review <review@openstack.org>2014-02-18 03:15:12 +0000
commita61e2219504101ac487c0266d51422b03a766111 (patch)
treea6edc03c346579c99e30a58a60f37e63f060b71c
parenta6db3e6c0ef61303d797ffdc07b457ebd3cb47e4 (diff)
parent518c02dd0a5b6746205de924dde11fd893a86308 (diff)
downloadheat-cfntools-a61e2219504101ac487c0266d51422b03a766111.tar.gz
Merge "Log stdout and stderr on non-zero exit status"
-rw-r--r--heat_cfntools/cfntools/cfn_helper.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py
index e699e6e..9579194 100644
--- a/heat_cfntools/cfntools/cfn_helper.py
+++ b/heat_cfntools/cfntools/cfn_helper.py
@@ -188,8 +188,10 @@ class CommandRunner(object):
self._stdout = output[0]
self._stderr = output[1]
if self._status:
- LOG.debug("Return code of %d after executing: '%s'" % (
- self._status, cmd))
+ LOG.debug("Return code of %d after executing: '%s'\n"
+ "stdout: '%s'\n"
+ "stderr: '%s'" % (self._status, cmd, self._stdout,
+ self._stderr))
if self._next:
self._next.run()
return self