Update sysfs reads

Log an error with a device callout on read failures

Change-Id: Ic9cd7ce3964e49879efd4bb19f197fd6a306773c
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

1 files changed, 15 insertions, 6 deletions

diff --git a/sysfs.cpp b/sysfs.cpp
index 8b67f3e..389b297 100644
--- a/sysfs.cpp
+++ b/sysfs.cpp
@@ -19,6 +19,7 @@
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/elog-errors.hpp>
 #include <xyz/openbmc_project/Control/Device/error.hpp>
+#include <xyz/openbmc_project/Sensor/Device/error.hpp>
 #include "sysfs.hpp"
 #include "util.hpp"
 
@@ -81,12 +82,20 @@ int readSysfsWithCallout(const std::string& root,
         // or read system calls that got us here.
         auto rc = errno;
         instancePath /= "device";
-        phosphor::logging::log<phosphor::logging::level::ERR>(
-            strerror(rc),
-            phosphor::logging::entry(
-                "CALLOUT_DEVICE_PATH=%s",
-                fs::canonical(instancePath).c_str()),
-            phosphor::logging::entry("CALLOUT_ERRNO=%d", rc));
+        using namespace sdbusplus::xyz::openbmc_project::Sensor::Device::Error;
+        try
+        {
+            elog<ReadFailure>(
+                xyz::openbmc_project::Sensor::Device::
+                    ReadFailure::CALLOUT_ERRNO(rc),
+                xyz::openbmc_project::Sensor::Device::
+                    ReadFailure::CALLOUT_DEVICE_PATH(
+                        fs::canonical(instancePath).c_str()));
+        }
+        catch (ReadFailure& elog)
+        {
+            commit(elog.name());
+        }
         exit(EXIT_FAILURE);
     }