crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[bcfg2/*/Python.py] Ajout de facilités de logging

Browse source 
darcs-hash:20091102205722-ffbb2-4fd8cd1cdc940cb39273b44b4d2a7dbdd24654b4.gz
This commit is contained in:
Nicolas Dandrimont 2009-11-02 21:57:22 +01:00
parent a4a6b5c4d9
commit 0c5782c7b5
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bcfg2/plugins/Python.py
View file

@ -73,10 +73,10 @@ def include(env, incfile):
env.included.add(incfile)
exec(includes[incfile], env)
def load_file(filename):
def load_file(filename, logger):
'''Charge un script et affiche un message d'erreur en cas d'exception'''
try:
return pygen.load(filename, os.path.dirname(filename) + "/." + os.path.basename(filename) + ".COMPILED")
return pygen.load(filename, os.path.dirname(filename) + "/." + os.path.basename(filename) + ".COMPILED", logger)
except Exception, e:
log_traceback(filename, 'compilation', e)
return None
@ -139,7 +139,7 @@ class Python(Bcfg2.Server.Plugin.Plugin,Bcfg2.Server.Plugin.Generator):
env.included = set([])
try:
include(env, "common")
text = pygen.generate(code, env)
text = pygen.generate(code, env, logger)
except Exception, e:
log_traceback(fname, 'exec', e)
raise Bcfg2.Server.Plugin.PluginExecutionError
@ -181,7 +181,7 @@ class Python(Bcfg2.Server.Plugin.Plugin,Bcfg2.Server.Plugin.Generator):
identifier = path[len(self.include)+1:-3]
if action in ['exists', 'created', 'changed']:
debug("adding include file: %s" % identifier, 'green')
includes[identifier] = load_file(path)
includes[identifier] = load_file(path, logger)
elif action == 'deleted':
debug("deleting include file: %s" % identifier, 'red')
del includes[identifier]
@ -194,10 +194,10 @@ class Python(Bcfg2.Server.Plugin.Plugin,Bcfg2.Server.Plugin.Generator):
identifier = path[len(self.data):]
if action in ['exists', 'created']:
debug("adding config file: %s" % identifier, 'green')
self.codes[identifier] = load_file(path)
self.codes[identifier] = load_file(path, logger)
self.Entries['ConfigFile'][identifier] = self.BuildEntry
elif action == 'changed':
self.codes[identifier] = load_file(path)
self.codes[identifier] = load_file(path, logger)
elif action == 'deleted':
debug("deleting config file: %s" % identifier, 'red')
del self.codes[identifier]