commit 6d6574c965d2e10ce97a219da7d61605b21dd716
author Jason M. Bills <jason.m.bills@intel.com> Tue Jun 28 12:30:16 2022 -0700
committer Ed Tanous <ed@tanous.net> Sat Jul 09 14:00:14 2022 +0000
tree e6b76adc9270dc071f7051f030ca9f06c947def9
parent c715ec296f0560d986d2cfaac2a7b4bb083f4735

Update host logger with recent JSON fixes

Similar changes were recently made for other log entry types to improve
handling of JSON objects. This applies the same fixes for host logger
entries.

I don't have a system that uses the host logger, so I'm not able to
test this change.

Change-Id: If5af976885a321e1077d89d92129f4b87a8e2943
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>

redfish-core/lib/log_services.hpp

diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index 82d53d9..be2d887 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -1819,20 +1819,19 @@
 
 inline void fillHostLoggerEntryJson(const std::string& logEntryID,
                                     const std::string& msg,
-                                    nlohmann::json& logEntryJson)
+                                    nlohmann::json::object_t& logEntryJson)
 {
     // Fill in the log entry with the gathered data.
-    logEntryJson = {
-        {"@odata.type", "#LogEntry.v1_4_0.LogEntry"},
-        {"@odata.id",
-         "/redfish/v1/Systems/system/LogServices/HostLogger/Entries/" +
-             logEntryID},
-        {"Name", "Host Logger Entry"},
-        {"Id", logEntryID},
-        {"Message", msg},
-        {"EntryType", "Oem"},
-        {"Severity", "OK"},
-        {"OemRecordFormat", "Host Logger Entry"}};
+    logEntryJson["@odata.type"] = "#LogEntry.v1_4_0.LogEntry";
+    logEntryJson["@odata.id"] =
+        "/redfish/v1/Systems/system/LogServices/HostLogger/Entries/" +
+        logEntryID;
+    logEntryJson["Name"] = "Host Logger Entry";
+    logEntryJson["Id"] = logEntryID;
+    logEntryJson["Message"] = msg;
+    logEntryJson["EntryType"] = "Oem";
+    logEntryJson["Severity"] = "OK";
+    logEntryJson["OemRecordFormat"] = "Host Logger Entry";
 }
 
 inline void requestRoutesSystemHostLogger(App& app)
@@ -1915,10 +1914,10 @@
         {
             for (size_t i = 0; i < logEntries.size(); i++)
             {
-                logEntryArray.push_back({});
-                nlohmann::json& hostLogEntry = logEntryArray.back();
+                nlohmann::json::object_t hostLogEntry;
                 fillHostLoggerEntryJson(std::to_string(delegatedQuery.skip + i),
                                         logEntries[i], hostLogEntry);
+                logEntryArray.push_back(std::move(hostLogEntry));
             }
 
             asyncResp->res.jsonValue["Members@odata.count"] = logCount;
@@ -1986,8 +1985,9 @@
 
         if (!logEntries.empty())
         {
-            fillHostLoggerEntryJson(targetID, logEntries[0],
-                                    asyncResp->res.jsonValue);
+            nlohmann::json::object_t hostLogEntry;
+            fillHostLoggerEntryJson(targetID, logEntries[0], hostLogEntry);
+            asyncResp->res.jsonValue.update(hostLogEntry);
             return;
         }