Skip to content
Closed

WIP #65

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ bazel_dep(name = "platforms", version = "1.0.0")

# S-CORE process rules
bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
bazel_dep(name = "score_docs_as_code", version = "2.2.0")
bazel_dep(name = "score_docs_as_code", version = "3.0.1")
bazel_dep(name = "score_tooling", version = "1.1.1")
bazel_dep(name = "score_rust_policies", version = "0.0.3")

bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)
bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True)
bazel_dep(name = "score_process", version = "1.4.3", dev_dependency = True)
bazel_dep(name = "score_platform", version = "0.5.3", dev_dependency = True)

# Toolchains and extensions
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
Expand Down Expand Up @@ -96,17 +96,12 @@ bazel_dep(name = "rapidjson", version = "1.1.0")
bazel_dep(name = "score_communication", version = "0.1.2")
git_override(
module_name = "score_communication",
commit = "3203fd41ea3509defc498e846e1674085d8469aa",
commit = "56448a5589a5f7d3921b873e8127b824a8c1ca95",
remote = "https://github.com/eclipse-score/communication.git",
)

bazel_dep(name = "score_baselibs", version = "0.2.0")
git_override(
module_name = "score_baselibs",
commit = "99d49637a2199f33a71edc479d39970e3bdcb271",
remote = "https://github.com/eclipse-score/baselibs.git",
)
bazel_dep(name = "score_baselibs", version = "0.2.4")

# Rust dependencies

bazel_dep(name = "score_baselibs_rust", version = "0.0.5")
bazel_dep(name = "score_baselibs_rust", version = "0.1.0")
2 changes: 1 addition & 1 deletion score/datarouter/src/logparser/logparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void LogParser::add_incoming_type(const bufsize_t map_index, const std::string&
logger_unpack_string(params.substr(12U), typeName);

typename_to_index.emplace(typeName, map_index);
IndexParser indexParser{TypeInfo{nv_config_.getDltMsgDesc(typeName), map_index, params, typeName, ecuId, appId}};
IndexParser indexParser{TypeInfo{nv_config_.GetDltMsgDesc(typeName), map_index, params, typeName, ecuId, appId}};
const auto ith_range = handle_request_map.equal_range(typeName);
for (auto ith = ith_range.first; ith != ith_range.second; ++ith)
{
Expand Down
4 changes: 2 additions & 2 deletions score/datarouter/test/ut/ut_logging/test_socketserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ TEST_F(SocketServerRemainingFunctionsTest, LoadNvConfigSuccessPath)

// Verify that we got a valid config by checking for a known type from test-class-id.json
// The test data contains "score::logging::PersistentLogFileEvent"
const auto* descriptor = nv_config.getDltMsgDesc("score::logging::PersistentLogFileEvent");
const auto* descriptor = nv_config.GetDltMsgDesc("score::logging::PersistentLogFileEvent");
EXPECT_NE(nullptr, descriptor); // Should find the entry
}

Expand All @@ -336,7 +336,7 @@ TEST_F(SocketServerRemainingFunctionsTest, LoadNvConfigErrorPath)
auto nv_config = SocketServer::LoadNvConfig(logger, "/nonexistent/path/class-id.json");

// Verify that we got an empty config by checking for any type
const auto* descriptor = nv_config.getDltMsgDesc("score::logging::PersistentLogFileEvent");
const auto* descriptor = nv_config.GetDltMsgDesc("score::logging::PersistentLogFileEvent");
EXPECT_EQ(nullptr, descriptor); // Empty config returns nullptr for all queries
}

Expand Down
2 changes: 1 addition & 1 deletion score/mw/log/legacy_non_verbose_api/tracing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ logger::logger(const score::cpp::optional<const score::mw::log::detail::Configur

std::optional<LogLevel> logger::GetLevelForContext(const std::string& name) const noexcept
{
const score::mw::log::config::NvMsgDescriptor* const msg_desc = nvconfig_.getDltMsgDesc(name);
const score::mw::log::config::NvMsgDescriptor* const msg_desc = nvconfig_.GetDltMsgDesc(name);
if (msg_desc != nullptr)
{
const auto ctxId = msg_desc->GetCtxId();
Expand Down
2 changes: 1 addition & 1 deletion score/mw/log/legacy_non_verbose_api/tracing.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class logger
{
auto log_level = LogLevel::kInfo;
const score::mw::log::config::NvMsgDescriptor* const msg_desc =
nvconfig_.getDltMsgDesc(::score::common::visitor::struct_visitable<T>::name());
nvconfig_.GetDltMsgDesc(::score::common::visitor::struct_visitable<T>::name());
if (msg_desc != nullptr)
{
auto message_descriptor_log_level = msg_desc->GetLogLevel();
Expand Down
Loading