merge given config into static log configuration

Author: Tommy Meisel

lib/api/LogConfiguration.cpp

@@ -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)
                 {
@@ -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;
     }
 

lib/include/public/LogConfiguration.hpp

@@ -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

wrappers/obj-c/ODWLogManager.mm

@@ -135,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
             {