From 8b17caade46cf84050961e24a0006386dbe96669 Mon Sep 17 00:00:00 2001 From: Mike Milner Date: Tue, 21 Feb 2012 15:26:08 -0400 Subject: Add test and fix for catching exceptions. --- cloudinit/__init__.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index 7a34e053..4338b46f 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -572,10 +572,14 @@ def handler_handle_part(mod, data, ctype, filename, payload, frequency): if not (modfreq == per_always or (frequency == per_instance and modfreq == per_instance)): return - if mod.handler_version == 1: - mod.handle_part(data, ctype, filename, payload) - else: - mod.handle_part(data, ctype, filename, payload, frequency) + try: + if mod.handler_version == 1: + mod.handle_part(data, ctype, filename, payload) + else: + mod.handle_part(data, ctype, filename, payload, frequency) + except: + util.logexc(log) + traceback.print_exc(file=sys.stderr) def partwalker_handle_handler(pdata, _ctype, _filename, payload): @@ -594,7 +598,6 @@ def partwalker_handle_handler(pdata, _ctype, _filename, payload): except: util.logexc(log) traceback.print_exc(file=sys.stderr) - return def partwalker_callback(pdata, ctype, filename, payload): -- cgit v1.2.3