rewrite emulator to class based approach for better logging

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-15 02:31:40 +02:00
parent 00a1f1eeb9
commit e002710c4c
2 changed files with 116 additions and 82 deletions

View file

@ -145,6 +145,10 @@ def configinstall(args, mode):
log.info("Total processing time for %s host(s): %s", len(args.host), log.info("Total processing time for %s host(s): %s", len(args.host),
(time_end - time_start)) (time_end - time_start))
def emulator():
"""Prepare and run emulator"""
emulator = cdist.emulator.Emulator(sys.argv)
emulator.run()
if __name__ == "__main__": if __name__ == "__main__":
try: try:
@ -152,7 +156,8 @@ if __name__ == "__main__":
if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])): if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
import cdist.emulator import cdist.emulator
cdist.emulator.run(sys.argv)
emulator()
else: else:
import cdist.banner import cdist.banner
import cdist.config import cdist.config

View file

@ -26,8 +26,6 @@ import os
import cdist import cdist
from cdist import core from cdist import core
log = logging.getLogger(__name__)
class IllegalRequirementError(cdist.Error): class IllegalRequirementError(cdist.Error):
def __init__(self, requirement, message=None): def __init__(self, requirement, message=None):
@ -37,19 +35,51 @@ class IllegalRequirementError(cdist.Error):
def __str__(self): def __str__(self):
return '%s: %s' % (self.message, self.requirement) return '%s: %s' % (self.message, self.requirement)
class Emulator(object):
def __init__(self, argv):
self.argv = argv
self.object_id = False
def run(argv): self.global_path = os.environ['__global']
self.object_source = os.environ['__cdist_manifest']
self.target_host = os.environ['__target_host']
self.type_base_path = os.environ['__cdist_type_base_path']
self.object_base_path = os.path.join(self.global_path, "object")
self.type_name = os.path.basename(argv[0])
self.cdist_type = core.Type(self.type_base_path, self.type_name)
self.__init_log()
def filter(self, record):
"""Add hostname and object to logs via logging Filter"""
prefix = self.target_host + ": "
if self.object_id:
prefix = prefix + self.type_name + "/" + self.object_id
record.msg = prefix + ": " + record.msg
return True
def run(self):
"""Emulate type commands (i.e. __file and co)""" """Emulate type commands (i.e. __file and co)"""
global_path = os.environ['__global']
object_source = os.environ['__cdist_manifest']
target_host = os.environ['__target_host']
type_name = os.path.basename(argv[0])
# Logsetup - FIXME: add object_fq as soon as setup! if '__install' in os.environ:
#id = target_host + ": " + cdist_type + '/' + object_id if not self.cdist_type.is_install:
id = target_host + ": " self.log.debug("Running in install mode, ignoring non install type")
# logformat = '%(levelname)s: ' + target_host + ": " + cdist_type + '/' + object_id + ': %(message)s' return True
logformat = '%(levelname)s: ' + id + ': %(message)s'
self.commandline()
self.setup_object()
self.record_requirements()
self.log.debug("Finished %s %s" % (self.cdist_object.path, self.parameters))
def __init_log(self):
"""Setup logging facility"""
logformat = '%(levelname)s: %(message)s'
logging.basicConfig(format=logformat) logging.basicConfig(format=logformat)
if '__debug' in os.environ: if '__debug' in os.environ:
@ -57,63 +87,64 @@ def run(argv):
else: else:
logging.root.setLevel(logging.INFO) logging.root.setLevel(logging.INFO)
object_base_path = os.path.join(global_path, "object") self.log = logging.getLogger(__name__)
type_base_path = os.environ['__cdist_type_base_path'] self.log.addFilter(self)
cdist_type = core.Type(type_base_path, type_name)
if '__install' in os.environ: def commandline(self):
if not cdist_type.is_install: """Parse command line"""
log.debug("Running in install mode, ignoring non install type")
return True
parser = argparse.ArgumentParser(add_help=False) parser = argparse.ArgumentParser(add_help=False)
for parameter in cdist_type.optional_parameters: for parameter in self.cdist_type.optional_parameters:
argument = "--" + parameter argument = "--" + parameter
parser.add_argument(argument, action='store', required=False) parser.add_argument(argument, action='store', required=False)
for parameter in cdist_type.required_parameters: for parameter in self.cdist_type.required_parameters:
argument = "--" + parameter argument = "--" + parameter
parser.add_argument(argument, action='store', required=True) parser.add_argument(argument, action='store', required=True)
# If not singleton support one positional parameter # If not singleton support one positional parameter
if not cdist_type.is_singleton: if not self.cdist_type.is_singleton:
parser.add_argument("object_id", nargs=1) parser.add_argument("object_id", nargs=1)
# And finally verify parameter # And finally parse/verify parameter
args = parser.parse_args(argv[1:]) self.args = parser.parse_args(self.argv[1:])
self.log.debug('Emulator args: %s' % self.args)
def setup_object(self):
# FIXME: verify object id
# Setup object_id # Setup object_id
if cdist_type.is_singleton: if self.cdist_type.is_singleton:
object_id = "singleton" self.object_id = "singleton"
else: else:
object_id = args.object_id[0] self.object_id = self.args.object_id[0]
del args.object_id del self.args.object_id
# strip leading slash from object_id # strip leading slash from object_id
object_id = object_id.lstrip('/') self.object_id = self.object_id.lstrip('/')
# Instantiate the cdist object whe are defining # Instantiate the cdist object we are defining
cdist_object = core.Object(cdist_type, object_base_path, object_id) self.cdist_object = core.Object(self.cdist_type, self.object_base_path, self.object_id)
# FIXME: verify object id
log.debug('#### emulator args: %s' % args)
# Create object with given parameters # Create object with given parameters
parameters = {} self.parameters = {}
for key,value in vars(args).items(): for key,value in vars(self.args).items():
if value is not None: if value is not None:
parameters[key] = value self.parameters[key] = value
if cdist_object.exists: if self.cdist_object.exists:
if cdist_object.parameters != parameters: if cdist_object.parameters != self.parameters:
raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s" raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s"
% (cdist_object, " ".join(cdist_object.source), cdist_object.parameters, object_source, parameters) % (self.cdist_object, " ".join(self.cdist_object.source), self.cdist_object.parameters, self.object_source, self.parameters)
) )
else: else:
cdist_object.create() self.cdist_object.create()
cdist_object.parameters = parameters self.cdist_object.parameters = self.parameters
def record_requirements(self):
"""record requirements"""
# Record requirements
if "require" in os.environ: if "require" in os.environ:
requirements = os.environ['require'] requirements = os.environ['require']
for requirement in requirements.split(" "): for requirement in requirements.split(" "):
@ -127,10 +158,8 @@ def run(argv):
requirement_object_id = 'singleton' requirement_object_id = 'singleton'
if requirement_object_id.startswith('/'): if requirement_object_id.startswith('/'):
raise IllegalRequirementError(requirement, 'requirements object_id may not start with /') raise IllegalRequirementError(requirement, 'requirements object_id may not start with /')
log.debug("Recording requirement: %s -> %s" % (cdist_object.path, requirement)) self.log.debug("Recording requirement: %s -> %s" % (self.cdist_object.path, requirement))
cdist_object.requirements.append(requirement) self.cdist_object.requirements.append(requirement)
# Record / Append source # Record / Append source
cdist_object.source.append(object_source) self.cdist_object.source.append(self.object_source)
log.debug("Finished %s %s" % (cdist_object.path, parameters))