commit 64b5ac203518568ec8b7569d0e785352278f2472
author Anwaar Hadi <anwaar.hadi@ibm.com> Fri Apr 04 23:54:53 2025 +0000
committer Anwaar Hadi <anwaar.hadi@ibm.com> Tue Apr 08 20:30:50 2025 +0000
tree 60564ab48b7e37d52a22e0b5434746b4ebbca984
parent 32c4feff9b1cd1fd4d75bb530761f70f0e5922e0

Move the control application to lg2

Update the logging API used for files in phosphor-fan-presence/control
from the older phosphor::logging::log to the more recent lg2::log.

Tested:
* Verified journal traces worked correctly in simulation.
* Modified json to force various property errors and verified
  correct key/value pairs in the journalctl output.

Change-Id: If1ac33b90abe2a9baae6f3cc788863bd514fa80e
Signed-off-by: Anwaar Hadi <anwaar.hadi@ibm.com>

control/main.cpp

diff --git a/control/main.cpp b/control/main.cpp
index 9286dc7..fddfb25 100644
--- a/control/main.cpp
+++ b/control/main.cpp
@@ -28,7 +28,7 @@
 #include "sdbusplus.hpp"
 #include "sdeventplus.hpp"
 
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/bus.hpp>
 #include <sdeventplus/event.hpp>
 #include <sdeventplus/source/signal.hpp>
@@ -37,7 +37,6 @@
 #include <fstream>
 
 using namespace phosphor::fan::control;
-using namespace phosphor::logging;
 
 #ifdef CONTROL_USE_JSON
 void dumpFlightRecorder()
@@ -129,25 +128,23 @@
     // return 1 so it is restarted without a core dump.
     catch (const phosphor::fan::util::DBusServiceError& e)
     {
-        log<level::ERR>("Uncaught DBus service lookup failure exception",
-                        entry("PATH=%s", e.path.c_str()),
-                        entry("INTERFACE=%s", e.interface.c_str()));
+        lg2::error(
+            "Uncaught DBus service lookup failure exception, Path={PATH}, Interface={INTERFACE}",
+            "PATH", e.path, "INTERFACE", e.interface);
     }
     catch (const phosphor::fan::util::DBusMethodError& e)
     {
-        log<level::ERR>("Uncaught DBus method failure exception",
-                        entry("BUSNAME=%s", e.busName.c_str()),
-                        entry("PATH=%s", e.path.c_str()),
-                        entry("INTERFACE=%s", e.interface.c_str()),
-                        entry("METHOD=%s", e.method.c_str()));
+        lg2::error(
+            "Uncaught DBus method failure exception, Busname={BUSNAME}, Path={PATH}, Interface={INTERFACE}, Method={METHOD}",
+            "BUSNAME", e.busName, "PATH", e.path, "INTERFACE", e.interface,
+            "METHOD", e.method);
     }
     catch (const phosphor::fan::util::DBusPropertyError& e)
     {
-        log<level::ERR>("Uncaught DBus property access failure exception",
-                        entry("BUSNAME=%s", e.busName.c_str()),
-                        entry("PATH=%s", e.path.c_str()),
-                        entry("INTERFACE=%s", e.interface.c_str()),
-                        entry("PROPERTY=%s", e.property.c_str()));
+        lg2::error(
+            "Uncaught DBus property access failure exception, Busname={BUSNAME}, Path={PATH}, Interface={INTERFACE}, Property={PROPERTY}",
+            "BUSNAME", e.busName, "PATH", e.path, "INTERFACE", e.interface,
+            "PROPERTY", e.property);
     }
     catch (std::exception& e)
     {