commit 13e3df602acb51a4505fce2fab1cedd04f010e7b
author George Liu <liuxiwei@inspur.com> Wed Jun 22 15:03:06 2022 +0800
committer George Liu <liuxiwei@inspur.com> Thu Jul 07 08:31:24 2022 +0800
tree ee76a91e578528e6e2e25a4ab784515130ffa518
parent 48e0a197c1737a1f53624638eb3496ba330c702c

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: I7de1e3782363c0c7f57ff917cf9487e4599cac8e

src/resolve_errors.cpp

diff --git a/src/resolve_errors.cpp b/src/resolve_errors.cpp
index b48ca4f..fd5be34 100644
--- a/src/resolve_errors.cpp
+++ b/src/resolve_errors.cpp
@@ -17,7 +17,7 @@
 
 #include "sdbusplus.hpp"
 
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 
 namespace phosphor
 {
@@ -32,7 +32,6 @@
 constexpr auto ENDPOINTS_PROPERTY = "endpoints";
 constexpr auto RESOLVED_PROPERTY = "Resolved";
 
-using namespace phosphor::logging;
 using EndpointList = std::vector<std::string>;
 using EndpointsProperty = std::variant<EndpointList>;
 
@@ -70,9 +69,8 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>("Failed getting callout fault associations",
-                        entry("CALLOUT=%s", callout.c_str()),
-                        entry("ERROR=%s", e.what()));
+        lg2::error("Failed getting callout fault associations: {ERROR}, {PATH}",
+                   "ERROR", e, "PATH", callout);
     }
 }
 
@@ -98,16 +96,15 @@
 
         if (response.is_method_error())
         {
-            log<level::ERR>(
-                "Failed to set Resolved property on an error log entry",
-                entry("ENTRY=%s", logEntry.c_str()));
+            lg2::error(
+                "Failed to set Resolved property on an error log entry: {ENTRY}",
+                "ENTRY", logEntry);
         }
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>("Unable to resolve error log entry",
-                        entry("ENTRY=%s", logEntry.c_str()),
-                        entry("ERROR=%s", e.what()));
+        lg2::error("Unable to resolve error log entry {ENTRY}: {ERROR}",
+                   "ENTRY", logEntry, "ERROR", e);
     }
 }