disk: Catch error for SMART devices w/o tmp sensors

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_collecty/blockdev.c b/src/_collecty/blockdev.c
index 2c715b92b9460db6d4121868282a6dbcba51ef43..09d3994fe6f0d64a17d766987b1ca9d772bcbaa8 100644 (file)
--- a/src/_collecty/blockdev.c
+++ b/src/_collecty/blockdev.c
@@ -296,8 +296,14 @@ PyObject* BlockDevice_get_temperature(PyObject* self) {
 
        uint64_t mkelvin;
        int r = sk_disk_smart_get_temperature(device->disk, &mkelvin);
 
        uint64_t mkelvin;
        int r = sk_disk_smart_get_temperature(device->disk, &mkelvin);

-       if (r)
+       if (r) {
+               // Temperature not available but SMART is supported
+               if (errno == ENOENT) {
+                       PyErr_Format(PyExc_OSError, "Device does not have a temperature");
+               }
+

                return NULL;
                return NULL;

+       }

 
        // Convert the temperature to Kelvin
        return PyFloat_FromDouble((double)mkelvin / 1000.0);
 
        // Convert the temperature to Kelvin
        return PyFloat_FromDouble((double)mkelvin / 1000.0);

diff --git a/src/collecty/plugins/disk.py b/src/collecty/plugins/disk.py
index 1b12c5c4107a680c11ff92591a4d443b60273e2c..a822eb20cdabcdc8966cabee503d09eec2bb3855 100644 (file)
--- a/src/collecty/plugins/disk.py
+++ b/src/collecty/plugins/disk.py
@@ -267,7 +267,10 @@ class DiskObject(base.Object):
                if not self.is_smart_supported():
                        return "NaN"
 
                if not self.is_smart_supported():
                        return "NaN"
 

-               return self.device.get_temperature()
+               try:
+                       return self.device.get_temperature()
+               except OSError:
+                       return "NaN"

 
        def get_bad_sectors(self):
                if not self.is_smart_supported():
 
        def get_bad_sectors(self):
                if not self.is_smart_supported():