From ea40409272226e7f556d5b8de35847cff2d64d9d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 17 Mar 2016 17:56:31 -0400 Subject: [PATCH] config: event object: null sets prop to default value Signed-off-by: Philippe Proulx --- barectf/config.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/barectf/config.py b/barectf/config.py index d74da5c..c2c25bb 100644 --- a/barectf/config.py +++ b/barectf/config.py @@ -2148,7 +2148,7 @@ class _YamlConfigParser: if unk_prop: raise ConfigError('unknown event object property: "{}"'.format(unk_prop)) - if 'log-level' in event_node: + if 'log-level' in event_node and event_node['log-level'] is not None: ll_node = event_node['log-level'] if _is_str_prop(ll_node): @@ -2168,7 +2168,9 @@ class _YamlConfigParser: event.log_level = ll - if 'context-type' in event_node: + if 'context-type' in event_node and event_node['context-type'] is not None: + ctx_type_node = event_node['context-type'] + try: t = self._create_type(event_node['context-type']) except Exception as e: @@ -2179,12 +2181,13 @@ class _YamlConfigParser: if 'payload-type' not in event_node: raise ConfigError('missing "payload-type" property in event object') - try: - t = self._create_type(event_node['payload-type']) - except Exception as e: - raise ConfigError('cannot create event\'s payload type object', e) + if event_node['payload-type'] is not None: + try: + t = self._create_type(event_node['payload-type']) + except Exception as e: + raise ConfigError('cannot create event\'s payload type object', e) - event.payload_type = t + event.payload_type = t return event -- 2.34.1