commit edaeb31c886e2b8d2d43664ec4178c8d35094742
author Brad Bishop <bradleyb@fuzziesquirrel.com> Sun Jul 30 19:38:20 2017 -0400
committer Patrick Williams <patrick@stwcx.xyz> Thu Aug 03 01:52:48 2017 +0000
tree 7a3a162ef3bae35ee1944dbe3a78e673b20f83c5
parent d7999b7c8d052dd64628b615a6ff84f189fd40ef

monitor: Allow missing sensors

Don't count sensors that don't exist as nonfunctional.  Let some
other application decide if missing sensors are a problem or not.

Change-Id: Ie3d438c92df16bfd86ddc86db8a9dd143bf2cfb0
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

monitor/fan.cpp

diff --git a/monitor/fan.cpp b/monitor/fan.cpp
index f3937c2..6d88d2a 100644
--- a/monitor/fan.cpp
+++ b/monitor/fan.cpp
@@ -49,13 +49,21 @@
 
     for (auto& s : sensors)
     {
-        _sensors.emplace_back(
-            std::make_unique<TachSensor>(bus,
-                                         *this,
-                                         std::get<sensorNameField>(s),
-                                         std::get<hasTargetField>(s),
-                                         std::get<timeoutField>(def),
-                                         events));
+        try
+        {
+            _sensors.emplace_back(
+                    std::make_unique<TachSensor>(
+                            bus,
+                            *this,
+                            std::get<sensorNameField>(s),
+                            std::get<hasTargetField>(s),
+                            std::get<timeoutField>(def),
+                            events));
+        }
+        catch (InvalidSensorError& e)
+        {
+
+        }
     }
 
     //Start from a known state of functional

monitor/fan.hpp

diff --git a/monitor/fan.hpp b/monitor/fan.hpp
index 8e7f86f..0004353 100644
--- a/monitor/fan.hpp
+++ b/monitor/fan.hpp
@@ -14,6 +14,13 @@
 namespace monitor
 {
 
+/**
+ * @class InvalidSensorError
+ *
+ * An exception type for sensors that don't exist or
+ * are otherwise inaccessible.
+ */
+class InvalidSensorError : public std::exception {};
 
 /**
  * @class Fan

monitor/tach_sensor.cpp

diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
index 0ec52ba..a4ebcd9 100644
--- a/monitor/tach_sensor.cpp
+++ b/monitor/tach_sensor.cpp
@@ -77,11 +77,21 @@
     _timer(events, [this, &fan](){ fan.timerExpired(*this); })
 {
     //Load in starting Target and Input values
-    readProperty(FAN_SENSOR_VALUE_INTF,
-                 FAN_VALUE_PROPERTY,
-                 _name,
-                 _bus,
-                 _tachInput);
+
+    try
+    {
+        // Use getProperty directly to allow a missing sensor object
+        // to abort construction.
+        _tachInput = util::SDBusPlus::getProperty<decltype(_tachInput)>(
+                _bus,
+                _name,
+                FAN_SENSOR_VALUE_INTF,
+                FAN_VALUE_PROPERTY);
+    }
+    catch (std::exception& e)
+    {
+        throw InvalidSensorError();
+    }
 
     if (_hasTarget)
     {