commit ce338fd1ae1ce55002c69610e7dc94689607f490
author George Liu <liuxiwei@ieisystem.com> Wed Jul 17 14:22:14 2024 +0800
committer George Liu <liuxiwei@ieisystem.com> Fri Jul 19 08:14:44 2024 +0800
tree 6dea8968bf94bef2f1d47badc14ca2c9063a2727
parent 34d19736349309928bdb8b6ddae23dbda727e3f0

softoff: switch to lg2

Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: I9b4071a8647182278b25b044355c707a908b4338

softoff/mainapp.cpp

diff --git a/softoff/mainapp.cpp b/softoff/mainapp.cpp
index 6f1f2d3..0791615 100644
--- a/softoff/mainapp.cpp
+++ b/softoff/mainapp.cpp
@@ -19,6 +19,7 @@
 
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/elog.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <sdeventplus/event.hpp>
 #include <sdeventplus/exception.hpp>
 #include <xyz/openbmc_project/State/Host/error.hpp>
@@ -59,8 +60,7 @@
         }
         catch (const sdeventplus::SdEventError& e)
         {
-            log<level::ERR>("Failure in processing request",
-                            entry("ERROR=%s", e.what()));
+            lg2::error("Failure in processing request: {ERROR}", "ERROR", e);
             return 1;
         }
     }

softoff/softoff.cpp

diff --git a/softoff/softoff.cpp b/softoff/softoff.cpp
index fe915d1..c8580b5 100644
--- a/softoff/softoff.cpp
+++ b/softoff/softoff.cpp
@@ -18,7 +18,7 @@
 #include "softoff.hpp"
 
 #include <ipmid/utils.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <xyz/openbmc_project/Control/Host/server.hpp>
 
 #include <chrono>
@@ -27,7 +27,6 @@
 namespace ipmi
 {
 
-using namespace phosphor::logging;
 using namespace sdbusplus::server::xyz::openbmc_project::control;
 
 void SoftPowerOff::sendHostShutDownCmd()
@@ -47,8 +46,8 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>("Error in call to control host Execute",
-                        entry("ERROR=%s", e.what()));
+        lg2::error("Error in call to control host Execute: {ERROR}", "ERROR",
+                   e);
         // TODO openbmc/openbmc#851 - Once available, throw returned error
         throw std::runtime_error("Error in call to control host Execute");
     }
@@ -62,9 +61,9 @@
 
     msg.read(cmdCompleted, cmdStatus);
 
-    log<level::DEBUG>("Host control signal values",
-                      entry("COMMAND=%s", cmdCompleted.c_str()),
-                      entry("STATUS=%s", cmdStatus.c_str()));
+    lg2::debug(
+        "Host control signal values, command: {COMMAND}, status:{STATUS}",
+        "COMMAND", cmdCompleted, "STATUS", cmdStatus);
 
     if (Host::convertResultFromString(cmdStatus) == Host::Result::Success)
     {
@@ -79,24 +78,25 @@
         auto r = startTimer(time);
         if (r < 0)
         {
-            log<level::ERR>("Failure to start Host shutdown wait timer",
-                            entry("ERRNO=0x%X", -r));
+            lg2::error(
+                "Failure to start Host shutdown wait timer, ERRNO: {ERRNO}",
+                "ERRNO", lg2::hex, -r);
         }
         else
         {
-            log<level::INFO>(
-                "Timer started waiting for host to shutdown",
-                entry("TIMEOUT_IN_MSEC=%llu",
+            lg2::info("Timer started waiting for host to shutdown, "
+                      "TIMEOUT_IN_MSEC: {TIMEOUT_IN_MSEC}",
+                      "TIMEOUT_IN_MSEC",
                       (duration_cast<milliseconds>(
                            seconds(IPMI_HOST_SHUTDOWN_COMPLETE_TIMEOUT_SECS)))
-                          .count()));
+                          .count());
         }
     }
     else
     {
         // An error on the initial attention is not considered an error, just
         // exit normally and allow remaining shutdown targets to run
-        log<level::INFO>("Timeout on host attention, continue with power down");
+        lg2::info("Timeout on host attention, continue with power down");
         completed = true;
     }
     return;
@@ -120,8 +120,8 @@
         auto r = timer.stop();
         if (r < 0)
         {
-            log<level::ERR>("Failure to STOP the timer",
-                            entry("ERRNO=0x%X", -r));
+            lg2::error("Failure to STOP the timer, ERRNO: {ERRNO}", "ERRNO",
+                       lg2::hex, -r);
         }
 
         // This marks the completion of soft power off sequence.