commit 296579be4c16e570ba8dcc65e7fe992cdc03e2a3
author Ed Tanous <ed@tanous.net> Mon Mar 11 16:58:24 2024 -0700
committer Ed Tanous <ed@tanous.net> Wed Apr 03 16:13:03 2024 +0000
tree dd2aeaae46b49e9919a05a4673659c4c3d6db239
parent 60e299bde06288ae01a1dace54039ad7646c3e85

Call dump() less

nlohmann::json::dump() is not an easy function to get the call
parameters correct on.  We should limit the places we use it.

Luckily, both logging and redfish::messages support printing
json values directly.  Use them where appropriate.

Tested: Error logging and out of range calls only of heavily used
messages and logging calls.  Inspection only.

Change-Id: I57521d8791dd95250c93e8e3b2d4a959740ac713
Signed-off-by: Ed Tanous <ed@tanous.net>

include/openbmc_dbus_rest.hpp

diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index dd1dac3..e1d66f5 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -597,10 +597,7 @@
                              const nlohmann::json& inputJson)
 {
     int r = 0;
-    BMCWEB_LOG_DEBUG(
-        "Converting {} to type: {}",
-        inputJson.dump(2, ' ', true, nlohmann::json::error_handler_t::replace),
-        argType);
+    BMCWEB_LOG_DEBUG("Converting {} to type: {}", inputJson, argType);
     const std::vector<std::string> argTypes = dbusArgSplit(argType);
 
     // Assume a single object for now.

redfish-core/lib/network_protocol.hpp

diff --git a/redfish-core/lib/network_protocol.hpp b/redfish-core/lib/network_protocol.hpp
index c57343c..31fc5af 100644
--- a/redfish-core/lib/network_protocol.hpp
+++ b/redfish-core/lib/network_protocol.hpp
@@ -294,21 +294,17 @@
         {
             if (!ntpServerObject->empty())
             {
-                messages::propertyValueNotInList(
-                    asyncResp->res,
-                    ntpServer.dump(2, ' ', true,
-                                   nlohmann::json::error_handler_t::replace),
-                    "NTP/NTPServers/" + std::to_string(index));
+                messages::propertyValueNotInList(asyncResp->res, ntpServer,
+                                                 "NTP/NTPServers/" +
+                                                     std::to_string(index));
                 return;
             }
             // Can't retain an item that doesn't exist
             if (currentNtpServer == currentNtpServers.end())
             {
-                messages::propertyValueOutOfRange(
-                    asyncResp->res,
-                    ntpServer.dump(2, ' ', true,
-                                   nlohmann::json::error_handler_t::replace),
-                    "NTP/NTPServers/" + std::to_string(index));
+                messages::propertyValueOutOfRange(asyncResp->res, ntpServer,
+                                                  "NTP/NTPServers/" +
+                                                      std::to_string(index));
 
                 return;
             }
@@ -321,11 +317,9 @@
             ntpServer.get_ptr<const std::string*>();
         if (ntpServerStr == nullptr)
         {
-            messages::propertyValueTypeError(
-                asyncResp->res,
-                ntpServer.dump(2, ' ', true,
-                               nlohmann::json::error_handler_t::replace),
-                "NTP/NTPServers/" + std::to_string(index));
+            messages::propertyValueTypeError(asyncResp->res, ntpServer,
+                                             "NTP/NTPServers/" +
+                                                 std::to_string(index));
             return;
         }
         if (currentNtpServer == currentNtpServers.end())