commit 3b1071ad94c13c90fe2b0257f1f23a29e56f81a8
author George Liu <liuxiwei@ieisystem.com> Wed Jul 17 20:26:14 2024 +0800
committer George Liu <liuxiwei@ieisystem.com> Wed Jul 24 08:19:47 2024 +0800
tree 8b3ec60d04cb4cc7ba7a90feafae4be3a75b3c94
parent 59d6dbb6791da26063783f759f685e55730ca150

convert sensorhandler.cpp to use lg2

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

sensorhandler.cpp

diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index 5c5af4e..7cbd2f8 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -11,7 +11,7 @@
 #include <ipmid/types.hpp>
 #include <ipmid/utils.hpp>
 #include <phosphor-logging/elog-errors.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/message/types.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
 #include <xyz/openbmc_project/Sensor/Value/server.hpp>
@@ -478,8 +478,8 @@
                                      uint8_t eventData1, uint8_t eventData2,
                                      uint8_t eventData3)
 {
-    log<level::DEBUG>("IPMI SET_SENSOR",
-                      entry("SENSOR_NUM=0x%02x", sensorNumber));
+    lg2::debug("IPMI SET_SENSOR, sensorNumber: {SENSOR_NUM}", "SENSOR_NUM",
+               lg2::hex, sensorNumber);
 
     if (sensorNumber == 0xFF)
     {
@@ -511,8 +511,9 @@
         if (ipmi::sensor::Mutability::Write !=
             (iter->second.mutability & ipmi::sensor::Mutability::Write))
         {
-            log<level::ERR>("Sensor Set operation is not allowed",
-                            entry("SENSOR_NUM=%d", sensorNumber));
+            lg2::error("Sensor Set operation is not allowed, "
+                       "sensorNumber: {SENSOR_NUM}",
+                       "SENSOR_NUM", lg2::hex, sensorNumber);
             return ipmi::responseIllegalCommand();
         }
         auto ipmiRC = iter->second.updateFunc(cmdData, iter->second);
@@ -520,14 +521,14 @@
     }
     catch (const InternalFailure& e)
     {
-        log<level::ERR>("Set sensor failed",
-                        entry("SENSOR_NUM=%d", sensorNumber));
+        lg2::error("Set sensor failed, sensorNumber: {SENSOR_NUM}",
+                   "SENSOR_NUM", lg2::hex, sensorNumber);
         commit<InternalFailure>();
         return ipmi::responseUnspecifiedError();
     }
     catch (const std::runtime_error& e)
     {
-        log<level::ERR>(e.what());
+        lg2::error("runtime error: {ERROR}", "ERROR", e);
         return ipmi::responseUnspecifiedError();
     }
 }
@@ -1072,7 +1073,7 @@
     }
     catch (const sdbusplus::exception::InvalidEnumString& e)
     {
-        log<level::WARNING>("Warning: no unit provided for sensor!");
+        lg2::warning("Warning: no unit provided for sensor!");
     }
 }
 
@@ -1474,7 +1475,7 @@
     }
     catch (const sdbusplus::exception_t& e)
     {
-        phosphor::logging::log<phosphor::logging::level::ERR>(e.what());
+        lg2::error("exception message: {ERROR}", "ERROR", e);
         return IPMI_CC_UNSPECIFIED_ERROR;
     }
     return IPMI_CC_OK;