x/cloud-init
Code Issues Proposed changes

When a handler version is set but to an unknown non-int convertable value, treat it as 1

Browse Source
This commit is contained in:
Joshua Harlow
2012-06-16 13:06:02 -07:00
parent 987c06768c
commit 77864b2c43
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cloudinit/handlers/__init__.py
View File

@@ -98,11 +98,18 @@ def run_part(mod, data, ctype, filename, payload, frequency):
(frequency == PER_INSTANCE and mod_freq == PER_INSTANCE)): (frequency == PER_INSTANCE and mod_freq == PER_INSTANCE)):
return return
mod_ver = mod.handler_version mod_ver = mod.handler_version
# Sanity checks on version (should be an int convertable)
try: try:
if mod_ver == 1: mod_ver = int(mod_ver)
mod.handle_part(data, ctype, filename, payload) except:
else: mod_ver = None
try:
if mod_ver and mod_ver >= 2:
# Treat as v. 2 which does get a frequency
mod.handle_part(data, ctype, filename, payload, frequency) mod.handle_part(data, ctype, filename, payload, frequency)
else:
# Treat as v. 1 which gets no frequency
mod.handle_part(data, ctype, filename, payload)
except: except:
util.logexc(LOG, ("Failed calling handler %s (%s, %s, %s)" util.logexc(LOG, ("Failed calling handler %s (%s, %s, %s)"
" with frequency %s"), " with frequency %s"),