commit cdf86de25dc52affd0161502f003eeb0e179cc3e
author Shawn McCarney <shawnmm@us.ibm.com> Tue Nov 26 10:02:14 2024 -0600
committer Shawn McCarney <shawnmm@us.ibm.com> Mon Dec 02 15:40:59 2024 -0600
tree 69e496ea15c876151957ad6877fa88869e32c5d4
parent 783406e649e90e13540f192f4111270a02d83168

Convert from log() to lg2()

Convert from the old log() API to the new lg2() API for logging journal
messages. The new API is simpler to use, and the old API may be
deprecated in the future.

Tested:
* Tested all lg2() calls to verify the resulting journal message was
  correct.
* For the complete test plan, see
  https://gist.github.com/smccarney/f4ed140bf7a46773b31c76b488e739dc

Change-Id: Ieb46c5d1481ceb51e5b0d51392b1c32596d8eac8
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>

src/activation.cpp

diff --git a/src/activation.cpp b/src/activation.cpp
index 5c90860..ed985a1 100644
--- a/src/activation.cpp
+++ b/src/activation.cpp
@@ -5,7 +5,7 @@
 #include "utils.hpp"
 
 #include <phosphor-logging/elog-errors.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 
 #include <cassert>
 #include <filesystem>
@@ -98,7 +98,7 @@
     }
     catch (const sdbusplus::exception_t& e)
     {
-        log<level::ERR>("Error staring service", entry("ERROR=%s", e.what()));
+        lg2::error("Error starting service: {ERROR}", "ERROR", e);
         onUpdateFailed();
         return false;
     }
@@ -139,8 +139,7 @@
 void Activation::onUpdateFailed()
 {
     // TODO: report an event
-    log<level::ERR>("Failed to update PSU",
-                    entry("PSU=%s", psuQueue.front().c_str()));
+    lg2::error("Failed to update PSU {PSU}", "PSU", psuQueue.front());
     std::queue<std::string>().swap(psuQueue); // Clear the queue
     activation(Status::Failed);
 }
@@ -150,15 +149,16 @@
     // Check if the activation has file path
     if (path().empty())
     {
-        log<level::WARNING>("No image for the activation, skipped",
-                            entry("VERSION_ID=%s", versionId.c_str()));
+        lg2::warning(
+            "No image for the activation, skipped version {VERSION_ID}",
+            "VERSION_ID", versionId);
         return activation(); // Return the previous activation status
     }
 
     auto psuPaths = utils::getPSUInventoryPath(bus);
     if (psuPaths.empty())
     {
-        log<level::WARNING>("No PSU inventory found");
+        lg2::warning("No PSU inventory found");
         return Status::Failed;
     }
 
@@ -168,22 +168,21 @@
         {
             if (utils::isAssociated(p, associations()))
             {
-                log<level::NOTICE>("PSU already running the image, skipping",
-                                   entry("PSU=%s", p.c_str()));
+                lg2::notice("PSU {PSU} is already running the image, skipping",
+                            "PSU", p);
                 continue;
             }
             psuQueue.push(p);
         }
         else
         {
-            log<level::NOTICE>("PSU not compatible",
-                               entry("PSU=%s", p.c_str()));
+            lg2::notice("PSU {PSU} is not compatible", "PSU", p);
         }
     }
 
     if (psuQueue.empty())
     {
-        log<level::WARNING>("No PSU compatible with the software");
+        lg2::warning("No PSU compatible with the software");
         return activation(); // Return the previous activation status
     }
 
@@ -267,9 +266,9 @@
     }
     catch (const sdbusplus::exception_t& e)
     {
-        log<level::ERR>("Error performing call to Delete object path",
-                        entry("ERROR=%s", e.what()),
-                        entry("PATH=%s", objPath.c_str()));
+        lg2::error(
+            "Error performing call to Delete object path {PATH}: {ERROR}",
+            "PATH", objPath, "ERROR", e);
     }
 }
 
@@ -316,9 +315,8 @@
     }
     catch (const fs::filesystem_error& e)
     {
-        log<level::ERR>("Error storing PSU image", entry("ERROR=%s", e.what()),
-                        entry("SRC=%s", src.c_str()),
-                        entry("DST=%s", dst.c_str()));
+        lg2::error("Error storing PSU image: src={SRC}, dst={DST}: {ERROR}",
+                   "SRC", src, "DST", dst, "ERROR", e);
     }
 }
 
@@ -341,7 +339,7 @@
 
 void ActivationBlocksTransition::enableRebootGuard()
 {
-    log<level::INFO>("PSU image activating - BMC reboots are disabled.");
+    lg2::info("PSU image activating - BMC reboots are disabled.");
 
     auto method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
                                       SYSTEMD_INTERFACE, "StartUnit");
@@ -351,7 +349,7 @@
 
 void ActivationBlocksTransition::disableRebootGuard()
 {
-    log<level::INFO>("PSU activation has ended - BMC reboots are re-enabled.");
+    lg2::info("PSU activation has ended - BMC reboots are re-enabled.");
 
     auto method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
                                       SYSTEMD_INTERFACE, "StartUnit");