src: Convert logging to lg2
Change-Id: I28bf669e5139062f0f6145277db65d6821d48e78
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index fc252ac..68233c0 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -8,6 +8,7 @@
#include <boost/asio/error.hpp>
#include <boost/asio/steady_timer.hpp>
#include <boost/container/flat_map.hpp>
+#include <phosphor-logging/lg2.hpp>
#include <sdbusplus/asio/connection.hpp>
#include <sdbusplus/asio/object_server.hpp>
#include <sdbusplus/exception.hpp>
@@ -17,7 +18,6 @@
#include <chrono>
#include <cstddef>
#include <cstdint>
-#include <iostream>
#include <limits>
#include <memory>
#include <string>
@@ -111,8 +111,9 @@
if (valueFind == cfg.end() || severityFind == cfg.end() ||
directionFind == cfg.end())
{
- std::cerr << "Malformed threshold on configuration interface "
- << intf << "\n";
+ lg2::error(
+ "Malformed threshold on configuration interface: '{INTERFACE}'",
+ "INTERFACE", intf);
return false;
}
unsigned int severity =
@@ -158,7 +159,7 @@
auto labelFind = result.find("Label");
if (labelFind == result.end())
{
- std::cerr << "No label in threshold configuration\n";
+ lg2::error("No label in threshold configuration");
return;
}
std::string label =
@@ -175,7 +176,7 @@
if (valueFind == result.end() || severityFind == result.end() ||
directionFind == result.end())
{
- std::cerr << "Malformed threshold in configuration\n";
+ lg2::error("Malformed threshold in configuration");
return;
}
unsigned int severity = std::visit(
@@ -194,8 +195,9 @@
[](const boost::system::error_code& ec) {
if (ec)
{
- std::cerr
- << "Error setting threshold " << ec << "\n";
+ lg2::error(
+ "Error setting threshold: '{ERROR_MESSAGE}'",
+ "ERROR_MESSAGE", ec.message());
}
},
entityManagerName, path, "org.freedesktop.DBus.Properties",
@@ -271,9 +273,11 @@
thresholdChanges.emplace_back(threshold, true, value);
if (++cHiTrue < assertLogCount)
{
- std::cerr << "Sensor " << sensor->name << " high threshold "
- << threshold.value << " assert: value " << value
- << " raw data " << sensor->rawValue << "\n";
+ lg2::info(
+ "Sensor name: {NAME}, high threshold: {THRESHOLD}, "
+ "assert value: {VALUE}, raw data: {RAW_DATA}",
+ "NAME", sensor->name, "THRESHOLD", threshold.value,
+ "VALUE", value, "RAW_DATA", sensor->rawValue);
}
}
else if (value < (threshold.value - threshold.hysteresis))
@@ -293,10 +297,11 @@
thresholdChanges.emplace_back(threshold, true, value);
if (++cLoTrue < assertLogCount)
{
- std::cerr
- << "Sensor " << sensor->name << " low threshold "
- << threshold.value << " assert: value " << sensor->value
- << " raw data " << sensor->rawValue << "\n";
+ lg2::info(
+ "Sensor name: {NAME}, low threshold: {THRESHOLD}, "
+ "assert value: {VALUE}, raw data: {RAW_DATA}",
+ "NAME", sensor->name, "THRESHOLD", threshold.value,
+ "VALUE", value, "RAW_DATA", sensor->rawValue);
}
}
else if (value > (threshold.value + threshold.hysteresis))
@@ -311,7 +316,7 @@
}
else
{
- std::cerr << "Error determining threshold direction\n";
+ lg2::error("Error determining threshold direction");
}
}
@@ -322,10 +327,12 @@
cDebugThrottle = 0;
if constexpr (debug)
{
- std::cerr << "checkThresholds: High T=" << cHiTrue
- << " F=" << cHiFalse << " M=" << cHiMidstate
- << ", Low T=" << cLoTrue << " F=" << cLoFalse
- << " M=" << cLoMidstate << "\n";
+ lg2::error("checkThresholds: High T= {HIGH_TRUE}, F= {HIGH_FALSE},"
+ " M= {HIGH_MIDSTATE}, Low T= {LOW_TRUE}, F= {LOW_FALSE},"
+ " M= {LOW_MIDSTATE}",
+ "HIGH_TRUE", cHiTrue, "HIGH_FALSE", cHiFalse,
+ "HIGH_MIDSTATE", cHiMidstate, "LOW_TRUE", cLoTrue,
+ "LOW_FALSE", cLoFalse, "LOW_MIDSTATE", cLoMidstate);
}
}
@@ -374,7 +381,8 @@
}
if (ec)
{
- std::cerr << "timer error: " << ec.message() << "\n";
+ lg2::error("timer error: '{ERROR_MESSAGE}'", "ERROR_MESSAGE",
+ ec.message());
return;
}
if (sensorPtr->readingStateGood())
@@ -451,14 +459,14 @@
if (!interface)
{
- std::cout << "trying to set uninitialized interface\n";
+ lg2::info("trying to set uninitialized interface");
return;
}
std::string property = Sensor::propertyAlarm(level, direction);
if (property.empty())
{
- std::cout << "Alarm property is empty \n";
+ lg2::info("Alarm property is empty");
return;
}
if (interface->set_property<bool, true>(property, assert))
@@ -475,8 +483,8 @@
}
catch (const sdbusplus::exception_t& e)
{
- std::cerr
- << "Failed to send thresholdAsserted signal with assertValue\n";
+ lg2::error(
+ "Failed to send thresholdAsserted signal with assertValue");
}
}
}
@@ -522,8 +530,8 @@
*val += offset;
if (debug)
{
- std::cout << "Threshold: " << attrPath << ": " << *val
- << "\n";
+ lg2::info("Threshold: '{PATH}': '{VALUE}'", "PATH",
+ attrPath, "VALUE", *val);
}
thresholdVector.emplace_back(level, direction, *val,
hysteresis);