x/cloud-init
Code Issues Proposed changes

1. Only register and increment the handler count after we have ensured it imports and call_begin passes.

Browse Source 
2. Fixup the 'test__init__.py' file to now be working again.
This commit is contained in:
Joshua Harlow 2012-06-21 17:15:45 -07:00
parent 2e83d545a7
commit 8069ce83ab
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cloudinit/handlers/__init__.py
View File

@ -135,12 +135,15 @@ def walker_handle_handler(pdata, _ctype, _filename, payload):
modfname = "%s.py" % (modfname)
# TODO: Check if path exists??
util.write_file(modfname, payload, 0600)
pdata['handlercount'] = curcount + 1
handlers = pdata['handlers']
try:
mod = fixup_handler(importer.import_module(modname))
handlers.register(mod)
call_begin(mod, pdata['data'], frequency)
# Only register and increment
# after the above have worked (so we don't if it
# fails)
handlers.register(mod)
pdata['handlercount'] = curcount + 1
except:
util.logexc(LOG, ("Failed at registering python file: %s"
" (part handler %s)"), modfname, curcount)