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

only debug if __debug is setup

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-27 16:40:50 +02:00
commit b52939ccfe
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/cdist/config.py
View file

@ -150,7 +150,8 @@ class Config:
env['__global'] = self.path.out_dir env['__global'] = self.path.out_dir
# Submit debug flag to manifest, can be used by emulator and types # Submit debug flag to manifest, can be used by emulator and types
env['__debug'] = "yes" if self.debug:
env['__debug'] = "yes"
# Required for recording source # Required for recording source
env['__cdist_manifest'] = manifest env['__cdist_manifest'] = manifest

12
lib/cdist/emulator.py
View file

@ -38,21 +38,19 @@ def run(argv):
if '__debug' in os.environ: if '__debug' in os.environ:
logging.root.setLevel(logging.DEBUG) logging.root.setLevel(logging.DEBUG)
else:
logging.basicConfig(level=logging.INFO)
parser = argparse.ArgumentParser(add_help=False) parser = argparse.ArgumentParser(add_help=False)
# Setup optional parameters
for parameter in cdist.path.file_to_list(os.path.join(param_dir, "optional")): for parameter in cdist.path.file_to_list(os.path.join(param_dir, "optional")):
argument = "--" + parameter argument = "--" + parameter
parser.add_argument(argument, action='store', required=False) parser.add_argument(argument, action='store', required=False)
# Setup required parameters
for parameter in cdist.path.file_to_list(os.path.join(param_dir, "required")): for parameter in cdist.path.file_to_list(os.path.join(param_dir, "required")):
argument = "--" + parameter argument = "--" + parameter
parser.add_argument(argument, action='store', required=True) parser.add_argument(argument, action='store', required=True)
# Setup positional parameter, if not singleton # If not singleton support one positional parameter
if not os.path.isfile(os.path.join(type_dir, "singleton")): if not os.path.isfile(os.path.join(type_dir, "singleton")):
parser.add_argument("object_id", nargs=1) parser.add_argument("object_id", nargs=1)
@ -70,6 +68,10 @@ def run(argv):
if object_id[0] == '/': if object_id[0] == '/':
object_id = object_id[1:] object_id = object_id[1:]
# Prefix output by object_self
logformat = '%(levelname)s: ' + type + '/' + object_id + ': %(message)s'
logging.basicConfig(format=logformat)
# FIXME: verify object id # FIXME: verify object id
log.debug(args) log.debug(args)