Changeset 5572

Timestamp:

12/16/08 10:36:03 (4 years ago)

Author:

khali

Message:

Don't bail out on transient errors (#2330).

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/sensord/sensord.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -26 +26 @@
                     and max6649 support
                    Accept negative temperatures in RRD database
+                   Don't bail out on transient errors (#2330)
   Program sensors: Recognize it87 thermal sensor type 4 as thermistor
                    Add it8720 support

lm-sensors/trunk/prog/sensord/sensord.c

@@ -86 +86 @@
   sensorLog (LOG_INFO, "sensord started");
 
-  while (!done && (ret == 0)) {
-    if (ret == 0)
-      ret = reloadLib ();
-    if ((ret == 0) && scanTime) { /* should I scan on the read cycle? */
-      ret = scanChips ();
-      if (scanValue <= 0)
-        scanValue += scanTime;
-    }
-    if ((ret == 0) && logTime && (logValue <= 0)) {
-      ret = readChips ();
+  while (!done) {
+    ret = reloadLib ();
+    if (ret)
+      sensorLog (LOG_NOTICE, "config reload error (%d)", ret);
+    if (scanTime && (scanValue <= 0)) {
+      if ((ret = scanChips ()))
+        sensorLog (LOG_NOTICE, "sensor scan error (%d)", ret);
+      scanValue += scanTime;
+    }
+    if (logTime && (logValue <= 0)) {
+      if ((ret = readChips ()))
+        sensorLog (LOG_NOTICE, "sensor read error (%d)", ret);
       logValue += logTime;
     }
-    if ((ret == 0) && rrdTime && rrdFile && (rrdValue <= 0)) {
-      ret = rrdUpdate ();
+    if (rrdTime && rrdFile && (rrdValue <= 0)) {
+      if ((ret = rrdUpdate ()))
+        sensorLog (LOG_NOTICE, "rrd update error (%d)", ret);
       /*
        * The amount of time to wait is computed using the same method as
@@ -106 +109 @@
       rrdValue = rrdTime - time(NULL) % rrdTime;
     }
-    if (!done && (ret == 0)) {
+    if (!done) {
       int a = logTime ? logValue : INT_MAX;
       int b = scanTime ? scanValue : INT_MAX;
@@ -118 +121 @@
   }
 
-  if (ret)
-    sensorLog (LOG_INFO, "sensord failed (%d)", ret);
-  else
-    sensorLog (LOG_INFO, "sensord stopped");
+  sensorLog (LOG_INFO, "sensord stopped");
 
   return ret;