From 94cca2e5372336c90246669c54bd0d89b822ea81 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Tue, 11 Oct 2011 00:28:53 +0200
Subject: [PATCH] prepend hostname in emulator as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
lib/cdist/config_install.py | 1 -
lib/cdist/emulator.py | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/cdist/config_install.py b/lib/cdist/config_install.py
index 0835f972..7c66d449 100644
--- a/lib/cdist/config_install.py
+++ b/lib/cdist/config_install.py
@@ -150,7 +150,6 @@ class ConfigInstall:
return True
-
def run_initial_manifest(self):
"""Run the initial manifest"""
log.info("Running initial manifest %s", self.initial_manifest)
diff --git a/lib/cdist/emulator.py b/lib/cdist/emulator.py
index 27a3abb1..b037d63d 100644
--- a/lib/cdist/emulator.py
+++ b/lib/cdist/emulator.py
@@ -34,6 +34,7 @@ def run(argv):
param_path = os.path.join(type_path, "parameter")
global_path = os.environ['__global']
object_source = os.environ['__cdist_manifest']
+ target_host = os.environ['__target_host']
if '__debug' in os.environ:
logging.root.setLevel(logging.DEBUG)
@@ -68,7 +69,7 @@ def run(argv):
object_id = object_id[1:]
# Prefix output by object_self
- logformat = '%(levelname)s: ' + cdist_type + '/' + object_id + ': %(message)s'
+ logformat = '%(levelname)s: ' + target_host + ": " + cdist_type + '/' + object_id + ': %(message)s'
logging.basicConfig(format=logformat)
# FIXME: verify object id
@@ -103,7 +104,7 @@ def run(argv):
value = getattr(args, param)
if value:
file = os.path.join(param_out_dir, param)
- log.debug(file + "<-" + param + " = " + value)
+ log.debug(file + " = " + value)
# Already exists, verify all parameter are the same
if object_exists: