From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 9 Dec 2007 14:30:29 +0000 (+0100)
Subject: disk plugin: Removed the `complain' stuff.
X-Git-Tag: collectd-4.3.0beta0~69
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=be5074e541f8bb6a73326388fb357f9aac237bfb;p=collectd.git

disk plugin: Removed the `complain' stuff.
---

diff --git a/src/disk.c b/src/disk.c
index 490da07a..d2e9f987 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -231,22 +231,14 @@ static int disk_read (void)
 	int  disk_minor;
 	char disk_name[64];
 
-	static complain_t complain_obj;
-
 	/* Get the list of all disk objects. */
 	if (IOServiceGetMatchingServices (io_master_port,
 				IOServiceMatching (kIOBlockStorageDriverClass),
 				&disk_list) != kIOReturnSuccess)
 	{
-		plugin_complain (LOG_ERR, &complain_obj, "disk plugin: "
-				"IOServiceGetMatchingServices failed.");
+		ERROR ("disk plugin: IOServiceGetMatchingServices failed.");
 		return (-1);
 	}
-	else if (complain_obj.interval != 0)
-	{
-		plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
-				"IOServiceGetMatchingServices succeeded.");
-	}
 
 	while ((disk = IOIteratorNext (disk_list)) != 0)
 	{
@@ -386,15 +378,12 @@ static int disk_read (void)
 
 	diskstats_t *ds, *pre_ds;
 
-	static complain_t complain_obj;
-
 	if ((fh = fopen ("/proc/diskstats", "r")) == NULL)
 	{
-		if ((fh = fopen ("/proc/partitions", "r")) == NULL)
+		fh = fopen ("/proc/partitions", "r");
+		if (fh == NULL)
 		{
-			plugin_complain (LOG_ERR, &complain_obj,
-					"disk plugin: Failed to open /proc/"
-					"{diskstats,partitions}.");
+			ERROR ("disk plugin: fopen (/proc/{diskstats,partitions}) failed.");
 			return (-1);
 		}
 
@@ -402,9 +391,6 @@ static int disk_read (void)
 		fieldshift = 1;
 	}
 
-	plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
-			"Succeeded to open /proc/{diskstats,partitions}.");
-
 	while (fgets (buffer, sizeof (buffer), fh) != NULL)
 	{
 		char *disk_name;