X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=c79c4b66bc4e01b994eb95222189592a413487d6;hb=ba758727dfd90eda6ff504e2abe9d9261d38d9e7;hp=ba0c1b1a2880db85195a77b6bf67c7a82edc5dc6;hpb=edc842a72e095b67348ed96d287c857ead49d229;p=collectd.git

diff --git a/src/cpu.c b/src/cpu.c
index ba0c1b1a..c79c4b66 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -277,20 +277,14 @@ static int cpu_read (void)
 	char *fields[9];
 	int numfields;
 
-	static complain_t complain_obj;
-
 	if ((fh = fopen ("/proc/stat", "r")) == NULL)
 	{
 		char errbuf[1024];
-		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
-				"fopen (/proc/stat) failed: %s",
+		ERROR ("cpu plugin: fopen (/proc/stat) failed: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 
-	plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: "
-			"fopen (/proc/stat) succeeded.");
-
 	while (fgets (buf, 1024, fh) != NULL)
 	{
 		if (strncmp (buf, "cpu", 3))
@@ -360,22 +354,16 @@ static int cpu_read (void)
 	long cpuinfo[CPUSTATES];
 	size_t cpuinfo_size;
 
-	static complain_t complain_obj;
-
 	cpuinfo_size = sizeof (cpuinfo);
 
 	if (sysctlbyname("kern.cp_time", &cpuinfo, &cpuinfo_size, NULL, 0) < 0)
 	{
 		char errbuf[1024];
-		plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: "
-				"sysctlbyname failed: %s.",
+		ERROR ("cpu plugin: sysctlbyname failed: %s.",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 
-	plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: "
-			"sysctlbyname succeeded.");
-
 	cpuinfo[CP_SYS] += cpuinfo[CP_INTR];
 
 	submit (0, "user", cpuinfo[CP_USER]);