df plugin: Improve error message.

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index 983d0c6..2e9b2ae 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -27,19 +27,20 @@
 #include "configfile.h"
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
-#include "utils_complain.h"
 
 #if HAVE_STATVFS
 # if HAVE_SYS_STATVFS_H
 #  include <sys/statvfs.h>
 # endif
 # define STATANYFS statvfs
+# define STATANYFS_STR "statvfs"
 # define BLOCKSIZE(s) ((s).f_frsize ? (s).f_frsize : (s).f_bsize)
 #elif HAVE_STATFS
 # if HAVE_SYS_STATFS_H
 #  include <sys/statfs.h>
 # endif
 # define STATANYFS statfs
+# define STATANYFS_STR "statfs"
 # define BLOCKSIZE(s) (s).f_bsize
 #else
 # error "No applicable input method."
@@ -65,8 +66,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 +207,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)
        {
@@ -233,7 +229,8 @@ static int df_read (void)
                if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
                {
                        char errbuf[1024];
-                       ERROR ("statv?fs failed: %s",
+                       ERROR (STATANYFS_STR"(%s) failed: %s",
+                                       mnt_ptr->dir,
                                        sstrerror (errno, errbuf,
                                                sizeof (errbuf)));
                        continue;