Skip to content

Commit

Permalink
[Messaging] Fixing a bug in Messaging deserialization, changing the c…
Browse files Browse the repository at this point in the history
…onfig (#1431)

* Create Documentation Required Checks workflow

* Fixing a Deserialize bug in Messaging that was causing problem with Tracing controls

* Changing the generic config so that no logging category is disabled by default

* Changing the warning reporting exemplary category to be off rather than on, as warning are on by default

* Adding an example module to Tracing config, matching the cmake names and order

* Treating DEPRECATED macro as a warning and not an error

* Adding an exception to deprecated warning in actions as well

* Reverting the deprecated change as we will deal with that only in proxystubs

* Reverting the deprecated change for actions as well

---------

Co-authored-by: Pierre Wielders <[email protected]>
  • Loading branch information
VeithMetro and pwielders authored Oct 24, 2023
1 parent 4cace77 commit 45773b4
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
30 changes: 19 additions & 11 deletions Source/WPEFramework/GenericConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -228,35 +228,43 @@ ans(MESSAGING_REPORTING_SETTINGS)

if(MESSAGING)
map()
kv(category "Notification")
kv(category "AnyCategory")
kv(enabled false)
end()
ans(PLUGIN_NOTIFICATION_LOGGING)
ans(PLUGIN_ANY_CATEGORY_LOGGING)

map()
kv(category "Fatal")
kv(category "AnyCategory")
kv(enabled true)
end()
ans(PLUGIN_FATAL_TRACING)
ans(PLUGIN_ANY_CATEGORY_TRACING)

map()
kv(category "TooLongWaitingForLock")
kv(module "Plugin_AnyPlugin")
kv(enabled true)
end()
ans(PLUGIN_TOOLONGWAIT_REPORTING)
ans(PLUGIN_ANY_PLUGIN_TRACING)

map()
kv(category "AnyCategory")
kv(enabled false)
end()
ans(PLUGIN_ANY_CATEGORY_REPORTING)

map_append(${MESSAGING_SETTINGS} logging ${MESSAGING_LOGGING_SETTINGS})
map_append(${MESSAGING_LOGGING_SETTINGS} settings ___array___)
map_append(${MESSAGING_LOGGING_SETTINGS} settings ${PLUGIN_ANY_CATEGORY_LOGGING})

map_append(${CONFIG} messaging ${MESSAGING_SETTINGS})
map_append(${MESSAGING_SETTINGS} tracing ${MESSAGING_TRACING_SETTINGS})
map_append(${MESSAGING_TRACING_SETTINGS} settings ___array___)
map_append(${MESSAGING_TRACING_SETTINGS} settings ${PLUGIN_FATAL_TRACING})
map_append(${MESSAGING_TRACING_SETTINGS} settings ${PLUGIN_ANY_CATEGORY_TRACING})
map_append(${MESSAGING_TRACING_SETTINGS} settings ${PLUGIN_ANY_PLUGIN_TRACING})

map_append(${MESSAGING_SETTINGS} logging ${MESSAGING_LOGGING_SETTINGS})
map_append(${MESSAGING_LOGGING_SETTINGS} settings ___array___)
map_append(${MESSAGING_LOGGING_SETTINGS} settings ${PLUGIN_NOTIFICATION_LOGGING})

map_append(${MESSAGING_SETTINGS} reporting ${MESSAGING_REPORTING_SETTINGS})
map_append(${MESSAGING_REPORTING_SETTINGS} settings ___array___)
map_append(${MESSAGING_REPORTING_SETTINGS} settings ${PLUGIN_TOOLONGWAIT_REPORTING})
map_append(${MESSAGING_REPORTING_SETTINGS} settings ${PLUGIN_ANY_CATEGORY_REPORTING})
endif()

map_append(${PLUGIN_CONTROLLER} configuration ${PLUGIN_CONTROLLER_CONFIGURATION})
Expand Down
2 changes: 1 addition & 1 deletion Source/core/MessageStore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ namespace Core {
length = (static_cast<uint16_t>(sizeof(_type) + (static_cast<uint16_t>(_category.size()) + 1)));

if (_type == TRACING) {
length += (static_cast<uint16_t>(_module.size()) + 1);
_module = frameReader.NullTerminatedText();
length += (static_cast<uint16_t>(_module.size()) + 1);
}
else if (_type == LOGGING) {
_module = MODULE_LOGGING;
Expand Down

0 comments on commit 45773b4

Please sign in to comment.