commit 5fbf498e1fe14271f548fe8758181de002e692eb
author George Liu <liuxiwei@ieisystem.com> Wed Jul 17 19:59:52 2024 +0800
committer George Liu <liuxiwei@ieisystem.com> Wed Jul 24 08:19:47 2024 +0800
tree 5cc3c2ba42220883d8cc886ed5a72556aebe681b
parent 32e8f5d318c1e2a87a27061aed802d576780605f

convert whitelist-filter.cpp to use lg2

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

whitelist-filter.cpp

diff --git a/whitelist-filter.cpp b/whitelist-filter.cpp
index 2c86464..5e22f54 100644
--- a/whitelist-filter.cpp
+++ b/whitelist-filter.cpp
@@ -2,7 +2,7 @@
 #include <ipmid/api.hpp>
 #include <ipmid/utils.hpp>
 #include <phosphor-logging/elog-errors.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <settings.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
 #include <xyz/openbmc_project/Control/Security/RestrictionMode/server.hpp>
@@ -56,7 +56,7 @@
 {
     bus = getSdBus();
 
-    log<level::INFO>("Loading allowlist filter");
+    lg2::info("Loading allowlist filter");
     ipmi::registerFilter(ipmi::prioOpenBmcBase,
                          [this](ipmi::message::Request::ptr request) {
         return filterMessage(request);
@@ -89,7 +89,7 @@
         }
         catch (const std::out_of_range& e)
         {
-            log<level::ERR>(
+            lg2::error(
                 "Could not look up restriction mode interface from cache");
             return;
         }
@@ -104,7 +104,7 @@
         }
         catch (const std::exception& e)
         {
-            log<level::ERR>("Error in RestrictionMode Get");
+            lg2::error("Error in RestrictionMode Get");
             // Fail-safe to true.
             size_t index = std::distance(&*std::begin(devices), &dev);
             restrictedMode[index] = true;
@@ -116,8 +116,8 @@
             (restrictionMode == RestrictionMode::Modes::Allowlist);
         restrictedMode.emplace_back(restrictMode);
 
-        log<level::INFO>((restrictMode ? "Set restrictedMode = true"
-                                       : "Set restrictedMode = false"));
+        lg2::info("Set restrictedMode = {RESTRICTED_MODE}", "RESTRICTED_MODE",
+                  restrictMode);
     }
 }
 
@@ -141,7 +141,7 @@
 
     if (it == deviceList.end())
     {
-        log<level::ERR>("Key not found in deviceList ");
+        lg2::error("Key not found in deviceList ");
     }
     else
     {
@@ -158,8 +158,9 @@
             bool restrictMode =
                 (restrictionMode == RestrictionMode::Modes::Allowlist);
             restrictedMode[hostId] = restrictMode;
-            log<level::INFO>((restrictMode ? "Updated restrictedMode = true"
-                                           : "Updated restrictedMode = false"));
+
+            lg2::info("Updated restrictedMode = {RESTRICTED_MODE}",
+                      "RESTRICTED_MODE", restrictMode);
         }
     }
 }
@@ -175,7 +176,7 @@
         *bus, std::vector<settings::Interface>({restrictionModeIntf}));
     if (!objects)
     {
-        log<level::ERR>(
+        lg2::error(
             "Failed to create settings object; defaulting to restricted mode");
         return;
     }
@@ -187,8 +188,7 @@
     }
     catch (const std::out_of_range& e)
     {
-        log<level::ERR>(
-            "Could not look up restriction mode interface from cache");
+        lg2::error("Could not look up restriction mode interface from cache");
         return;
     }
 
@@ -234,9 +234,10 @@
                 allowlist.cbegin(), allowlist.cend(),
                 std::make_pair(request->ctx->netFn, request->ctx->cmd)))
         {
-            log<level::ERR>("Net function not allowlisted",
-                            entry("NETFN=0x%X", int(request->ctx->netFn)),
-                            entry("CMD=0x%X", int(request->ctx->cmd)));
+            lg2::error("Net function not allowlisted, "
+                       "NetFn: {NETFN}, Cmd: {CMD}",
+                       "NETFN", lg2::hex, request->ctx->netFn, "CMD", lg2::hex,
+                       request->ctx->cmd);
 
             return ipmi::ccInsufficientPrivilege;
         }