From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 28 Jun 2010 08:01:39 +0000 (+0200)
Subject: df plugin: Remove the complaint code again.
X-Git-Tag: collectd-4.9.3~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3ed9d797be095b8ba50ef8b684cb7054b335ffa9;p=collectd.git

df plugin: Remove the complaint code again.

Calls to the plugin are delayed when an error is returned anyway, so it's
better to have an error message in addition to the "has failed, will suspend"
message generated in src/plugin.c.
---

diff --git a/src/df.c b/src/df.c
index 983d0c66..fc80ac3f 100644
--- a/src/df.c
+++ b/src/df.c
@@ -27,7 +27,6 @@
 #include "configfile.h"
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
-#include "utils_complain.h"
 
 #if HAVE_STATVFS
 # if HAVE_SYS_STATVFS_H
@@ -65,8 +64,6 @@ static _Bool by_device = false;
 static _Bool report_reserved = false;
 static _Bool report_inodes = false;
 
-static c_complain_t complaint = C_COMPLAIN_INIT_STATIC;
-
 static int df_init (void)
 {
 	if (il_device == NULL)
@@ -208,12 +205,9 @@ static int df_read (void)
 	mnt_list = NULL;
 	if (cu_mount_getlist (&mnt_list) == NULL)
 	{
-		c_complain (LOG_ERR, &complaint,
-				"df plugin: cu_mount_getlist failed.");
+		ERROR ("df plugin: cu_mount_getlist failed.");
 		return (-1);
 	}
-	c_release (LOG_INFO, &complaint,
-			"df plugin: cu_mount_getlist returned successfully.");
 
 	for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
 	{