From 5e2e80be72e28e185949e0e39e7ffa3e19fcc434 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Sat, 12 Mar 2016 00:56:23 -0500 Subject: [PATCH] config: make event's log-level property accept integer Signed-off-by: Philippe Proulx --- barectf/config.py | 13 ++++++++++--- doc/examples/linux-fs-simple/config.yaml | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/barectf/config.py b/barectf/config.py index da03d13..99b43f1 100644 --- a/barectf/config.py +++ b/barectf/config.py @@ -2028,10 +2028,17 @@ class _YamlConfigParser: raise ConfigError('unknown event object property: "{}"'.format(unk_prop)) if 'log-level' in event_node: - ll = self._lookup_log_level(event_node['log-level']) + ll_node = event_node['log-level'] - if ll is None: - raise ConfigError('invalid "log-level" property') + if _is_str_prop(ll_node): + ll = self._lookup_log_level(event_node['log-level']) + + if ll is None: + raise ConfigError('cannot find log level "{}"'.format(ll_node)) + elif _is_int_prop(ll_node): + ll = ll_node + else: + raise ConfigError('"log-level" property must be either a string or an integer') event.log_level = ll diff --git a/doc/examples/linux-fs-simple/config.yaml b/doc/examples/linux-fs-simple/config.yaml index 19109e7..e7ac5a7 100644 --- a/doc/examples/linux-fs-simple/config.yaml +++ b/doc/examples/linux-fs-simple/config.yaml @@ -106,6 +106,7 @@ metadata: id: uint16 events: simple_uint32: + log-level: CRIT payload-type: class: struct fields: @@ -121,6 +122,7 @@ metadata: fields: value: float simple_string: + log-level: WARNING payload-type: class: struct fields: @@ -142,6 +144,7 @@ metadata: class: string state: state bit_packed_integers: + log-level: 513 payload-type: class: struct min-align: 8 -- 2.34.1