commit 0bacc8efe036e2e0360bae1d69e9f41e4af83524
author Matt Spinler <spinler@us.ibm.com> Fri Jul 07 16:25:39 2023 -0500
committer Matt Spinler <spinler@us.ibm.com> Tue Jul 11 21:45:10 2023 +0000
tree dfa81220121c55ea93824350f695ec0e10da9fea
parent db3f27988ed72a53203860641bd5f4a4190b4e4b

PEL: Use lg2 in SRC class

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Iccb7cbd56f394bcafb4e8c5a8d3aef506007ebad

extensions/openpower-pels/src.cpp

diff --git a/extensions/openpower-pels/src.cpp b/extensions/openpower-pels/src.cpp
index 00ea0b8..c9750cc 100644
--- a/extensions/openpower-pels/src.cpp
+++ b/extensions/openpower-pels/src.cpp
@@ -28,7 +28,7 @@
 #endif
 #include <fmt/format.h>
 
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 
 namespace openpower
 {
@@ -36,7 +36,6 @@
 {
 namespace pv = openpower::pels::pel_values;
 namespace rg = openpower::pels::message;
-using namespace phosphor::logging;
 using namespace std::string_literals;
 
 constexpr size_t ccinSize = 4;
@@ -169,12 +168,9 @@
         if (!PyDict_Contains(pDict, pKey))
         {
             Py_DECREF(pDict);
-            log<level::ERR>(
-                "Python module error",
-                entry("ERROR=%s",
-                      std::string(funcToCall + " function missing").c_str()),
-                entry("SRC=%s", hexwords.front().c_str()),
-                entry("PARSER_MODULE=%s", module.c_str()));
+            lg2::error(
+                "Python module error.  Function missing: {FUNC}, SRC = {SRC}, module = {MODULE}",
+                "FUNC", funcToCall, "SRC", hexwords.front(), "MODULE", module);
             return std::nullopt;
         }
         PyObject* pFunc = PyDict_GetItemString(pDict, funcToCall.c_str());
@@ -217,10 +213,9 @@
                 }
                 catch (const std::exception& e)
                 {
-                    log<level::ERR>("Bad JSON from parser",
-                                    entry("ERROR=%s", e.what()),
-                                    entry("SRC=%s", hexwords.front().c_str()),
-                                    entry("PARSER_MODULE=%s", module.c_str()));
+                    lg2::error(
+                        "Bad JSON from parser. Error = {ERROR}, SRC = {SRC}, module = {MODULE}",
+                        "ERROR", e, "SRC", hexwords.front(), "MODULE", module);
                     return std::nullopt;
                 }
             }
@@ -251,10 +246,9 @@
     }
     if (!pErrStr.empty())
     {
-        log<level::DEBUG>("Python exception thrown by parser",
-                          entry("ERROR=%s", pErrStr.c_str()),
-                          entry("SRC=%s", hexwords.front().c_str()),
-                          entry("PARSER_MODULE=%s", module.c_str()));
+        lg2::debug("Python exception thrown by parser. Error = {ERROR}, "
+                   "SRC = {SRC}, module = {MODULE}",
+                   "ERROR", pErrStr, "SRC", hexwords.front(), "MODULE", module);
     }
     return std::nullopt;
 }
@@ -306,8 +300,7 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>(
-            fmt::format("Cannot unflatten SRC: {}", e.what()).c_str());
+        lg2::error("Cannot unflatten SRC, error = {ERROR}", "ERROR", e);
         _valid = false;
     }
 }
@@ -374,10 +367,8 @@
                                              pel_values::subsystemValues);
         if (subsystem == "invalid")
         {
-            log<level::WARNING>(
-                fmt::format("SRC: Invalid SubSystem value:{:#X}",
-                            eventSubsystem)
-                    .c_str());
+            lg2::warning("SRC: Invalid SubSystem value: {VAL}", "VAL", lg2::hex,
+                         eventSubsystem);
         }
         else
         {
@@ -444,8 +435,8 @@
     }
     catch (const std::exception& e)
     {
-        log<level::WARNING>("Could not convert motherboard CCIN to a number",
-                            entry("CCIN=%s", ccinString.c_str()));
+        lg2::warning("Could not convert motherboard CCIN {CCIN} to a number",
+                     "CCIN", ccinString);
         return;
     }
 
@@ -460,17 +451,15 @@
     if ((header().id != static_cast<uint16_t>(SectionID::primarySRC)) &&
         (header().id != static_cast<uint16_t>(SectionID::secondarySRC)))
     {
-        log<level::ERR>(
-            fmt::format("Invalid SRC section ID: {0:#x}", header().id).c_str());
+        lg2::error("Invalid SRC section ID: {ID}", "ID", lg2::hex, header().id);
         failed = true;
     }
 
     // Check the version in the SRC, not in the header
     if (_version != srcVersion)
     {
-        log<level::ERR>(
-            fmt::format("Invalid SRC version: {0:#x}", header().version)
-                .c_str());
+        lg2::error("Invalid SRC version: {VERSION}", "VERSION", lg2::hex,
+                   header().version);
         failed = true;
     }
 
@@ -612,8 +601,9 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>("Cannot get error message from registry entry",
-                        entry("ERROR=%s", e.what()));
+        lg2::error(
+            "Cannot get error message from registry entry, error = {ERROR}",
+            "ERROR", e);
     }
     return std::nullopt;
 }
@@ -1493,8 +1483,7 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>(
-            fmt::format("Checking dump status failed: {}", e.what()).c_str());
+        lg2::error("Checking dump status failed: {ERROR}", "ERROR", e);
     }
 }
 
@@ -1549,8 +1538,7 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>(
-            fmt::format("Error getting progress code: {}", e.what()).c_str());
+        lg2::error("Error getting progress code: {ERROR}", "ERROR", e);
         return;
     }