commit e9fb5c6a1728a2f8a6ec69f4150d527502fb5510
author George Liu <liuxiwei@inspur.com> Thu Jul 01 14:05:32 2021 +0800
committer Patrick Williams <patrick@stwcx.xyz> Wed Sep 15 13:41:35 2021 +0000
tree c8078e1ac87bc600b088d70341fff89b61652d6f
parent d78de14df5a9ee6babb7f4ef75a1c4b58bf6376c

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.

Tested: built ledManager successfully and Unit Test passes.

Before: The file does not exist or is empty
After: The file does not exist or is empty, FILE_PATH = /usr/share/phosphor-led-manager/lamp-test-led-overrides.json

MESSAGE=File does not exist, FILE_PATH = /var/lib/phosphor-led-manager/savedGroups
LOG2_FMTMSG=File does not exist, FILE_PATH = {PATH}
CODE_FILE=../../../../../../fp5280g2-workspace/sources/phosphor-led-manager/serialize.cpp
CODE_LINE=63
CODE_FUNC=void phosphor::led::Serialize::restoreGroups()
PATH=/var/lib/phosphor-led-manager/savedGroups
SYSLOG_IDENTIFIER=phosphor-ledmanager
_PID=298
_COMM=phosphor-ledman
_EXE=/usr/bin/phosphor-ledmanager
_CMDLINE=phosphor-ledmanager
_SYSTEMD_CGROUP=/system.slice/xyz.openbmc_project.LED.GroupManager.service
_SYSTEMD_UNIT=xyz.openbmc_project.LED.GroupManager.service
_SYSTEMD_INVOCATION_ID=5ddd4960a3b04fe29c34e4ce03b6be06

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

serialize.cpp

diff --git a/serialize.cpp b/serialize.cpp
index 897b336..7bde9b7 100644
--- a/serialize.cpp
+++ b/serialize.cpp
@@ -5,7 +5,7 @@
 #include <cereal/archives/json.hpp>
 #include <cereal/types/set.hpp>
 #include <cereal/types/string.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 
 #include <filesystem>
 #include <fstream>
@@ -55,12 +55,10 @@
 
 void Serialize::restoreGroups()
 {
-    using namespace phosphor::logging;
 
     if (!fs::exists(path))
     {
-        log<level::INFO>("File does not exist",
-                         entry("FILE_PATH=%s", path.c_str()));
+        lg2::info("File does not exist, FILE_PATH = {PATH}", "PATH", path);
         return;
     }
 
@@ -72,7 +70,7 @@
     }
     catch (cereal::Exception& e)
     {
-        log<level::ERR>(e.what());
+        lg2::error("Failed to restore groups, ERROR = {ERROR}", "ERROR", e);
         fs::remove(path);
     }
 }