X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbattery.c;h=9b060dd9286cc692f03cd8205121868fe0f786ae;hb=b99f2ef5c262080cdd55d4dc056aaf23ba2ff907;hp=185442c10d319aa53011b2e1c87f058f28fd254c;hpb=b327e1498df04ec20075e6f4d9859f0650d9b3e9;p=collectd.git

diff --git a/src/battery.c b/src/battery.c
index 185442c1..9b060dd9 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -416,10 +416,13 @@ static int sysfs_file_to_buffer(char const *dir, /* {{{ */
 
 	if (fgets (buffer, buffer_size, fp) == NULL)
 	{
-		char errbuf[1024];
 		status = errno;
-		WARNING ("battery plugin: fgets failed: %s",
-				sstrerror (status, errbuf, sizeof (errbuf)));
+		if (status != ENODEV)
+		{
+			char errbuf[1024];
+			WARNING ("battery plugin: fgets (%s) failed: %s", filename,
+					sstrerror (status, errbuf, sizeof (errbuf)));
+		}
 		fclose (fp);
 		return status;
 	}
@@ -513,13 +516,15 @@ static int read_sysfs_callback (char const *dir, /* {{{ */
 			v *= -1.0;
 		battery_submit (plugin_instance, "power", v * SYSFS_FACTOR);
 	}
+	if (sysfs_file_to_gauge (dir, power_supply, "current_now", &v) == 0)
+	{
+		if (discharging)
+			v *= -1.0;
+		battery_submit (plugin_instance, "current", v * SYSFS_FACTOR);
+	}
 
 	if (sysfs_file_to_gauge (dir, power_supply, "voltage_now", &v) == 0)
 		battery_submit (plugin_instance, "voltage", v * SYSFS_FACTOR);
-#if 0
-	if (sysfs_file_to_gauge (dir, power_supply, "voltage_min_design", &v) == 0)
-		battery_submit (plugin_instance, "voltage", v * SYSFS_FACTOR);
-#endif
 
 	return (0);
 } /* }}} int read_sysfs_callback */