commit 17ab6e056c0ea319067eff5963df70b67e9511fa
author James Feist <james.feist@linux.intel.com> Tue Jun 25 12:28:13 2019 -0700
committer James Feist <james.feist@linux.intel.com> Tue Jun 25 19:31:24 2019 +0000
tree a13d99d7a8cc10824ba83dd8a61d3af9c5ba92d4
parent 996bad1157fd1b50564ecb1fbd9502667a6e23e4

Fix Threshold Parse

We agreed on using Label field, so not having thresholds
should be ok.

Tested: PSU1&2 fanspeeds are back

Change-Id: I99b27300a6ee3ebb92b637297adbcc058c6b223b
Signed-off-by: James Feist <james.feist@linux.intel.com>

src/PSUSensorMain.cpp

diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index cff542f..cabe06a 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -393,7 +393,9 @@
                 }
             }
             else
+            {
                 nameIndex = 0;
+            }
 
             auto findProperty = labelMatch.find(labelHead);
             if (findProperty == labelMatch.end())
@@ -408,11 +410,10 @@
 
             std::vector<thresholds::Threshold> sensorThresholds;
 
-            parseThresholdsFromConfig(*sensorData, sensorThresholds,
-                                      &labelHead);
-            if (sensorThresholds.empty())
+            if (!parseThresholdsFromConfig(*sensorData, sensorThresholds))
             {
-                continue;
+                std::cerr << "error populating thresholds for "
+                          << sensorNameSubStr << "\n";
             }
 
             auto findSensorType = sensorTable.find(sensorNameSubStr);