Skip to content

Simplify logManager configuration initialization #1403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomasameisel wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Simplify logManager configuration initialization #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225068a
Simplify logManager configuration initialization
thomasameisel Jan 20, 2026
eb9199a
Change logManagerConfig to use auto reference
thomasameisel Jan 22, 2026
48f8df1
merge given config into static log configuration
Jan 22, 2026
ff973d8
Merge branch 'main' into thmeisel/Config-Crash-Fix
lalitb Jan 22, 2026
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
19 changes: 12 additions & 7 deletions lib/api/LogConfiguration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,13 @@ namespace MAT_NS_BEGIN {
return result;
}

ILogConfiguration FromJSON(const char* configuration)
void MergeFromJSON(ILogConfiguration &config, const char* configuration)
{
ILogConfiguration result;
#ifdef HAVE_MAT_JSONHPP
auto src = json::parse(configuration);
std::function<void(json &src, VariantMap &dst)> parse;
parse = [&parse](json &src, VariantMap &dst)->void {
for (json::iterator it = src.begin(); it != src.end(); ++it) {
auto jsonRoot = json::parse(configuration);
std::function<void(json &node, VariantMap &dst)> parse;
parse = [&parse](json &node, VariantMap &dst)->void {
for (json::iterator it = node.begin(); it != node.end(); ++it) {
auto t = it.value().type();
switch (t)
{
Expand Down Expand Up @@ -119,11 +118,17 @@ namespace MAT_NS_BEGIN {
}
}
};
parse(src, *result);
parse(jsonRoot, *config);
#else
(void)(configuration);
assert(false /* json.hpp support is not enabled! */);
#endif
}

ILogConfiguration FromJSON(const char* configuration)
{
ILogConfiguration result;
MergeFromJSON(result, configuration);
return result;
}

Expand Down
2 changes: 2 additions & 0 deletions lib/include/public/LogConfiguration.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ namespace MAT_NS_BEGIN {

MATSDK_LIBABI ILogConfiguration FromJSON(const char* json);

MATSDK_LIBABI void MergeFromJSON(ILogConfiguration &config, const char* json);

} MAT_NS_END

#endif
Expand Down
9 changes: 3 additions & 6 deletions wrappers/obj-c/ODWLogManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,8 @@ +(nullable ILogger *)initializeLogManager:(nonnull NSString *)tenantToken withCo
ILogger* logger = nullptr;
try
{
static ILogConfiguration logManagerConfig;

// Initializing logManager config with default configuration
auto& defaultConfig = LogManager::GetLogConfiguration();
logManagerConfig = defaultConfig;
// Get reference to the default configuration
auto& logManagerConfig = LogManager::GetLogConfiguration();

// Update logManager config when custom configuration is provided.
if (config != nil && config.count > 0)
Expand All @@ -138,7 +135,7 @@ +(nullable ILogger *)initializeLogManager:(nonnull NSString *)tenantToken withCo
if (jsonData)
{
NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
logManagerConfig = MAT::FromJSON([jsonString UTF8String]);
MAT::MergeFromJSON(logManagerConfig, [jsonString UTF8String]);
}
else
{
Expand Down
Loading