diff options
| -rwxr-xr-x | tools/elog-gen.py | 6 | ||||
| -rw-r--r-- | tools/phosphor-logging/templates/elog-gen-template.mako.hpp | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tools/elog-gen.py b/tools/elog-gen.py index 9169a6e..825fc0f 100755 --- a/tools/elog-gen.py +++ b/tools/elog-gen.py @@ -230,8 +230,10 @@ def get_elog_data(i_elog_yaml, if 'inherits' in match: parents[fullname] = match['inherits'][0] + # Put all errors in meta[] even the meta is empty + # so that child errors could inherits such error without meta + tmp_meta = [] if 'meta' in match: - tmp_meta = [] # grab all the meta data fields and info for i in match['meta']: str_short = i['str'].split('=')[0] @@ -242,7 +244,7 @@ def get_elog_data(i_elog_yaml, meta_data[str_short]['type'] = get_cpp_type(i['type']) if ('process' in i) and (True == i['process']): metadata_process[str_short] = fullname + "." + str_short - meta[fullname] = tmp_meta + meta[fullname] = tmp_meta # Debug # for i in errors: diff --git a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp index 23d8c08..0d156ad 100644 --- a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp +++ b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp @@ -103,10 +103,13 @@ struct ${b} parent_meta += [parent_namespace + "::" + parent_name + "::" + p for p in meta[parent]] parent_meta_short = ', '.join(meta[parent]) - if(meta_string): - meta_string = meta_string + ", " + parent_meta_short - else: - meta_string = parent_meta_short + # The parent may have empty meta, + # so only add parent meta when it exists + if (parent_meta_short): + if(meta_string): + meta_string = meta_string + ", " + parent_meta_short + else: + meta_string = parent_meta_short parent = parents[parent] if example_yaml: |
