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

ajout de traceback

Browse source 
darcs-hash:20080209010131-af139-e1cc9fd883d67c891dac9b8d602bff10aa35bf55.gz
This commit is contained in:
Jeremie Dimino 2008-02-09 02:01:31 +01:00
parent 2b9c65a1de
commit f407272074
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bcfg2/plugins/Python.py
View file

@ -132,7 +132,16 @@ class Python(Bcfg2.Server.Plugin.Plugin):
entry.text = pygen.generate(code, env) entry.text = pygen.generate(code, env)
debug(entry.text) debug(entry.text)
except Exception, e: except Exception, e:
import traceback
from cStringIO import StringIO
s = StringIO()
sys.stderr = s
traceback.print_exc()
sys.stderr = sys.__stderr__
traceback = s.getvalue()
logger.error('Python exec error: %s: %s' % (str(e.__class__).split('.', 2)[1], str(e))) logger.error('Python exec error: %s: %s' % (str(e.__class__).split('.', 2)[1], str(e)))
for line in traceback.splitlines():
logger.error('Python exec error: -> %s' % line)
raise Bcfg2.Server.Plugin.PluginExecutionError raise Bcfg2.Server.Plugin.PluginExecutionError
entry.attrib['owner'] = env["info"]['owner'] entry.attrib['owner'] = env["info"]['owner']
entry.attrib['group'] = env["info"]['group'] entry.attrib['group'] = env["info"]['group']

4
bcfg2/pygen.py
View file

@ -25,7 +25,7 @@ fichier de configuration à partir d'un script python'''
__all__ = [ "Environment", "compileSource", "generate", "load" ] __all__ = [ "Environment", "compileSource", "generate", "load" ]
import re, marshal, os import re, marshal, os, sys
from cStringIO import StringIO from cStringIO import StringIO
# Pour l'arrêt d'un script # Pour l'arrêt d'un script
@ -180,8 +180,6 @@ def load(fname, cfname=None):
return code return code
if __name__ == "__main__": if __name__ == "__main__":
import sys
result = generate(load(sys.argv[1])) result = generate(load(sys.argv[1]))
print "resultat:" print "resultat:"