1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 328e90a4e557f86e488e92174ca9a78eada2ee50 Mon Sep 17 00:00:00 2001
From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
Date: Mon, 5 Sep 2022 16:19:16 +0300
Subject: [PATCH] Fix Min Max and HealthMon SDR
---
src/sensorcommands.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index 91a83b8..eed86f7 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -192,6 +192,7 @@ static void getSensorMaxMin(const SensorMap& sensorMap, double& max,
{
min = std::visit(VariantToDoubleVisitor(), minMap->second);
}
+ return;
}
if (critical != sensorMap.end())
{
@@ -207,6 +208,7 @@ static void getSensorMaxMin(const SensorMap& sensorMap, double& max,
double value = std::visit(VariantToDoubleVisitor(), upper->second);
max = std::max(value, max);
}
+ return;
}
if (warning != sensorMap.end())
{
@@ -224,6 +226,7 @@ static void getSensorMaxMin(const SensorMap& sensorMap, double& max,
max = std::max(value, max);
}
}
+ return;
}
static bool getSensorMap(boost::asio::yield_context yield,
@@ -253,10 +256,18 @@ static bool getSensorMap(boost::asio::yield_context yield,
yield, ec, sensorConnection.c_str(), "/",
"org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
if (ec)
+ {
+ ec.clear();
+ managedObjects = dbus->yield_method_call<ManagedObjectType>(
+ yield, ec, sensorConnection.c_str(), "/xyz/openbmc_project/sensors",
+ "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
+
+ }
+ if(ec)
{
phosphor::logging::log<phosphor::logging::level::ERR>(
"GetMangagedObjects for getSensorMap failed",
- phosphor::logging::entry("ERROR=%s", ec.message().c_str()));
+ phosphor::logging::entry("ERROR=%s, PATH=%s, S_CONN=%s", ec.message().c_str(), sensorPath.c_str(), sensorConnection.c_str()));
return false;
}
|
