mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

add correct logger in manifest

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-15 01:38:22 +02:00
commit a415cc4b91
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/cdist/core/manifest.py
View file

@ -25,9 +25,6 @@ import os
import cdist import cdist
log = logging.getLogger(__name__)
''' '''
common: common:
runs only locally, does not need remote runs only locally, does not need remote
@ -68,13 +65,16 @@ class Manifest(object):
def __init__(self, target_host, local): def __init__(self, target_host, local):
self.target_host = target_host self.target_host = target_host
self.local = local self.local = local
self.log = logging.getLogger(self.target_host)
self.env = { self.env = {
'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']), 'PATH': "%s:%s" % (self.local.bin_path, os.environ['PATH']),
'__target_host': self.target_host, '__target_host': self.target_host,
'__global': self.local.out_path, '__global': self.local.out_path,
'__cdist_type_base_path': self.local.type_path, # for use in type emulator '__cdist_type_base_path': self.local.type_path, # for use in type emulator
} }
if log.getEffectiveLevel() == logging.DEBUG: if self.log.getEffectiveLevel() == logging.DEBUG:
self.env.update({'__debug': "yes" }) self.env.update({'__debug': "yes" })
@ -83,7 +83,7 @@ class Manifest(object):
env.update(self.env) env.update(self.env)
env['__manifest'] = self.local.manifest_path env['__manifest'] = self.local.manifest_path
env['__cdist_manifest'] = script env['__cdist_manifest'] = script
log.info("Running initial manifest " + self.local.manifest_path) self.log.info("Running initial manifest " + self.local.manifest_path)
self.local.run_script(script, env=env) self.local.run_script(script, env=env)
def run_type_manifest(self, cdist_object): def run_type_manifest(self, cdist_object):