commit c9bb64255034d8805c5a8c0e5ea55139b3c6662a
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 27 06:18:35 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed Sep 01 16:36:33 2021 +0000
tree 6b5dc5b3dc8c8bbdc8486e465f08f6ba6611eecd
parent 1c8781ff856da6274a47d13a6d2c755ed8ded698

logging: switch to lg2

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id62fbc10ab83a0cf94d235e1d1ea3e031295fbf5

msl_verify.cpp

diff --git a/msl_verify.cpp b/msl_verify.cpp
index 6a1c7aa..b74f6e9 100644
--- a/msl_verify.cpp
+++ b/msl_verify.cpp
@@ -4,11 +4,12 @@
 
 #include "version.hpp"
 
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
+#include <xyz/openbmc_project/Software/Version/server.hpp>
 
 #include <regex>
 
-using namespace phosphor::logging;
+PHOSPHOR_LOG2_USING;
 
 int minimum_ship_level::compare(const Version& versionToCompare,
                                 const Version& mslVersion)
@@ -44,8 +45,7 @@
 
     if (!std::regex_search(inpVersion, match, rx))
     {
-        log<level::ERR>("Unable to parse BMC version",
-                        entry("VERSION=%s", inpVersion.c_str()));
+        error("Unable to parse BMC version: {VERSION}", "VERSION", inpVersion);
         return;
     }
 
@@ -83,12 +83,12 @@
     auto rc = compare(actualVersion, mslVersion);
     if (rc < 0)
     {
-        log<level::ERR>(
-            "BMC Minimum Ship Level NOT met",
-            entry("MIN_VERSION=%s", msl.c_str()),
-            entry("ACTUAL_VERSION=%s", tmpStr.c_str()),
-            entry("VERSION_PURPOSE=%s",
-                  "xyz.openbmc_project.Software.Version.VersionPurpose.BMC"));
+        auto purpose = sdbusplus::xyz::openbmc_project::Software::server::
+            Version::VersionPurpose::BMC;
+        error(
+            "BMC Minimum Ship Level ({MIN_VERSION}) NOT met by {ACTUAL_VERSION}",
+            "MIN_VERSION", msl, "ACTUAL_VERSION", tmpStr, "VERSION_PURPOSE",
+            purpose);
         return false;
     }