From 764ea49904c84b76c8d5eb7775078fa9843350c8 Mon Sep 17 00:00:00 2001
From: Darko Poljak <foss@ungleich.com>
Date: Sun, 17 Sep 2017 20:30:07 +0200
Subject: [PATCH] Log more data.

---
 cdist/config.py        | 3 ++-
 cdist/core/manifest.py | 3 ++-
 cdist/exec/local.py    | 3 ++-
 cdist/exec/remote.py   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cdist/config.py b/cdist/config.py
index f5c3121d..6ba3d0dc 100644
--- a/cdist/config.py
+++ b/cdist/config.py
@@ -331,7 +331,8 @@ class Config(object):
                 host, remote_copy))
 
             target_host = ipaddr.resolve_target_addresses(host)
-            log.debug("target_host: {}".format(target_host))
+            log.debug("target_host for host \"{}\": {}".format(
+                host, target_host))
 
             local = cdist.exec.local.Local(
                 target_host=target_host,
diff --git a/cdist/core/manifest.py b/cdist/core/manifest.py
index 82e9f780..fccd3a2f 100644
--- a/cdist/core/manifest.py
+++ b/cdist/core/manifest.py
@@ -179,7 +179,8 @@ class Manifest(object):
                                      cdist_object.cdist_type.manifest_path)
         message_prefix = cdist_object.name
         if os.path.isfile(type_manifest):
-            self.log.verbose("Running type manifest " + type_manifest)
+            self.log.verbose("Running type manifest %s for object %s",
+                             type_manifest, cdist_object.name)
             self.local.run_script(type_manifest,
                                   env=self.env_type_manifest(cdist_object),
                                   message_prefix=message_prefix,
diff --git a/cdist/exec/local.py b/cdist/exec/local.py
index 9f37bde2..e5771076 100644
--- a/cdist/exec/local.py
+++ b/cdist/exec/local.py
@@ -232,7 +232,8 @@ class Local(object):
             if save_output:
                 output, errout = exec_util.call_get_output(
                     command, env=env, stderr=stderr)
-                self.log.trace("Local stdout: {}".format(output))
+                self.log.trace("Command: {}; local stdout: {}".format(
+                    command, output))
                 # Currently, stderr is not captured.
                 # self.log.trace("Local stderr: {}".format(errout))
                 if return_output:
diff --git a/cdist/exec/remote.py b/cdist/exec/remote.py
index b834cd97..44bc2927 100644
--- a/cdist/exec/remote.py
+++ b/cdist/exec/remote.py
@@ -309,7 +309,8 @@ class Remote(object):
                 stderr = None
             output, errout = exec_util.call_get_output(
                 command, env=os_environ, stderr=stderr)
-            self.log.trace("Remote stdout: {}".format(output))
+            self.log.trace("Command: {}; remote stdout: {}".format(
+                command, output))
             # Currently, stderr is not captured.
             # self.log.trace("Remote stderr: {}".format(errout))
             if return_output: