commit 4155a5a83b292a8b29daedb9577090e053383e98
author George Liu <liuxiwei@ieisystem.com> Fri Jan 24 15:26:27 2025 +0800
committer George Liu <liuxiwei@ieisystem.com> Wed Mar 12 18:13:07 2025 +0800
tree f0b4d51ebcae85f20a76a63a25c50d90e7882c46
parent a205c6fae8ba05b86f9b04b4a5de47314fa9ba49

psu: Convert logging to lg2

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

src/psu/PSUSensor.cpp

diff --git a/src/psu/PSUSensor.cpp b/src/psu/PSUSensor.cpp
index 4d410fe..2ba212e 100644
--- a/src/psu/PSUSensor.cpp
+++ b/src/psu/PSUSensor.cpp
@@ -26,13 +26,13 @@
 #include <boost/asio/error.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/random_access_file.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 
 #include <array>
 #include <chrono>
 #include <cstddef>
-#include <iostream>
 #include <limits>
 #include <memory>
 #include <stdexcept>
@@ -65,11 +65,13 @@
     std::string unitPath = sensor_paths::getPathForUnits(sensorUnits);
     if constexpr (debug)
     {
-        std::cerr << "Constructed sensor: path " << path << " type "
-                  << objectType << " config " << sensorConfiguration
-                  << " typename " << unitPath << " factor " << factor << " min "
-                  << min << " max " << max << " offset " << offset << " name \""
-                  << sensorName << "\"\n";
+        lg2::debug(
+            "Constructed sensor - path: {PATH}, type: {TYPE}, config: {CONFIG}, "
+            "typename: {TYPENAME}, factor: {FACTOR}, min: {MIN}, max: {MAX}, "
+            "offset: {OFFSET}, name: {NAME}",
+            "PATH", path, "TYPE", objectType, "CONFIG", sensorConfiguration,
+            "TYPENAME", unitPath, "FACTOR", factor, "MIN", min, "MAX", max,
+            "OFFSET", offset, "NAME", sensorName);
     }
     if (pollRate > 0.0)
     {
@@ -159,7 +161,7 @@
 
     if (buffer == nullptr)
     {
-        std::cerr << "Buffer was invalid?";
+        lg2::error("Buffer was invalid?");
         return;
     }
 
@@ -189,7 +191,7 @@
     waitTimer.async_wait([weakRef](const boost::system::error_code& ec) {
         if (ec == boost::asio::error::operation_aborted)
         {
-            std::cerr << "Failed to reschedule\n";
+            lg2::error("Failed to reschedule");
             return;
         }
         std::shared_ptr<PSUSensor> self = weakRef.lock();
@@ -207,20 +209,20 @@
 {
     if (err == boost::asio::error::operation_aborted)
     {
-        std::cerr << "Read aborted\n";
+        lg2::error("Read aborted");
         return;
     }
     if ((err == boost::system::errc::bad_file_descriptor) ||
         (err == boost::asio::error::misc_errors::not_found))
     {
-        std::cerr << "Bad file descriptor for " << path << "\n";
+        lg2::error("Bad file descriptor for '{PATH}'", "PATH", path);
         return;
     }
     if (err || bytesRead == 0)
     {
         if (readingStateGood())
         {
-            std::cerr << name << " read failed\n";
+            lg2::error("'{NAME}' read failed", "NAME", name);
         }
         restartRead();
         return;
@@ -237,7 +239,7 @@
     }
     catch (const std::invalid_argument&)
     {
-        std::cerr << "Could not parse  input from " << path << "\n";
+        lg2::error("Could not parse input from '{PATH}'", "PATH", path);
         incrementError();
     }