config: make event's log-level property accept integer

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/barectf/config.py b/barectf/config.py
index da03d13a1672b2d9d46d57623a901859b26059ac..99b43f15ed2f4c4add4331f18c0246c9ba95260d 100644 (file)
--- 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 19109e74e3ce23b973bc7eae03dcc73829126032..e7ac5a71cc2b32d546851c8de09f3c4e5934f382 100644 (file)
--- 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