Changeset 5580

Timestamp:

01/08/09 12:01:41 (4 years ago)

Author:

khali

Message:

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

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -7 +7 @@
   maxilife scripts: Delete (driver never ported to Linux 2.6)
   sensord: Accept negative temperatures in RRD database
+           Don't bail out on transient errors (#2330)
   sensors: Add support for instantaneous power sensors
            Add support for current sensors

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.c

@@ -91 +91 @@
   sensorLog (LOG_INFO, "sensord started");
 
-  while (!done && (ret == 0)) {
+  while (!done) {
     if (reload) {
       ret = reloadLib (sensorsCfgFile);
+      if (ret)
+        sensorLog (LOG_NOTICE, "config reload error (%d)", ret);
       reload = 0;
     }
-    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 ();
+    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
@@ -113 +117 @@
       rrdValue = rrdTime - time(NULL) % rrdTime;
     }
-    if (!done && (ret == 0)) {
+    if (!done) {
       int a = logTime ? logValue : INT_MAX;
       int b = scanTime ? scanValue : INT_MAX;
@@ -125 +129 @@
   }
 
-  if (ret)
-    sensorLog (LOG_INFO, "sensord failed (%d)", ret);
-  else
-    sensorLog (LOG_INFO, "sensord stopped");
+  sensorLog (LOG_INFO, "sensord stopped");
 
   return ret;