commit 9fb159700f98937bab15a9b056e435ec28600161
author George Liu <liuxiwei@inspur.com> Mon Jun 20 14:54:38 2022 +0800
committer George Liu <liuxiwei@inspur.com> Fri Jun 24 19:56:38 2022 +0800
tree 3f1b883a191dabf9e209c99b158d8c496cba06ed
parent d6a1bae7b7d07e05d658d686ff688d4c5a448e82

logging: switch to lg2

After switching to C++20, it is recommended to use `phosphor::lg2`
to format log, and the correct `CODE_LINE` and `CODE_FUNC` values
can be used in log tracking.

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I7983e39c9afdd455b21923f860f827cf9a9c257c

src/hostSelector_switch.cpp

diff --git a/src/hostSelector_switch.cpp b/src/hostSelector_switch.cpp
index dbdd836..66b79c8 100644
--- a/src/hostSelector_switch.cpp
+++ b/src/hostSelector_switch.cpp
@@ -1,9 +1,13 @@
 
 #include "hostSelector_switch.hpp"
 
+#include <error.h>
+
+#include <phosphor-logging/lg2.hpp>
+
 // add the button iface class to registry
 static ButtonIFRegister<HostSelector> buttonRegister;
-using namespace phosphor::logging;
+
 size_t HostSelector::getMappedHSConfig(size_t hsPosition)
 {
     size_t adjustedPosition = INVALID_INDEX; // set bmc as default value
@@ -16,9 +20,8 @@
     }
     else
     {
-        log<level::DEBUG>(
-            "getMappedHSConfig : no valid value in map.",
-            entry("FORM_FACTOR_TYPE=%s", (getFormFactorType()).c_str()));
+        lg2::debug("getMappedHSConfig : {TYPE}: no valid value in map.", "TYPE",
+                   getFormFactorType());
     }
     return adjustedPosition;
 }
@@ -43,9 +46,8 @@
 
         if (result < 0)
         {
-            log<level::ERR>(
-                "gpio fd lseek error!",
-                entry("FORM_FACTOR_TYPE=%s", (getFormFactorType()).c_str()));
+            lg2::error("{TYPE}: Gpio fd lseek error: {ERROR}", "TYPE",
+                       getFormFactorType(), "ERROR", errno);
             throw sdbusplus::xyz::openbmc_project::Chassis::Common::Error::
                 IOError();
         }
@@ -53,9 +55,8 @@
         result = ::read(config.gpios[index].fd, &buf, sizeof(buf));
         if (result < 0)
         {
-            log<level::ERR>(
-                "gpio fd read error!",
-                entry("FORM_FACTOR_TYPE=%s", (getFormFactorType()).c_str()));
+            lg2::error("{TYPE}: Gpio fd read error: {ERROR}", "TYPE",
+                       getFormFactorType(), "ERROR", errno);
             throw sdbusplus::xyz::openbmc_project::Chassis::Common::Error::
                 IOError();
         }
@@ -104,18 +105,16 @@
 
     if (n < 0)
     {
-        log<level::ERR>(
-            "gpio fd lseek error!",
-            entry("FORM_FACTOR_TYPE=%s", (getFormFactorType()).c_str()));
+        lg2::error("{TYPE}: Gpio fd lseek error: {ERROR}", "TYPE",
+                   getFormFactorType(), "ERROR", errno);
         return;
     }
 
     n = ::read(fd, &buf, sizeof(buf));
     if (n < 0)
     {
-        log<level::ERR>(
-            "gpio fd read error!",
-            entry("FORM_FACTOR_TYPE=%s", (getFormFactorType()).c_str()));
+        lg2::error("{TYPE}: Gpio fd read error: {ERROR}", "TYPE",
+                   getFormFactorType(), "ERROR", errno);
         throw sdbusplus::xyz::openbmc_project::Chassis::Common::Error::
             IOError();
     }