From: Florian Forster <octo@collectd.org>
Date: Sun, 11 Nov 2012 08:20:58 +0000 (+0100)
Subject: aggregation plugin: Improve two error messages.
X-Git-Tag: collectd-5.2.0~23
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=39e8aea3d71784b76d2cb7a03e4506e26de7de4b;p=collectd.git

aggregation plugin: Improve two error messages.
---

diff --git a/src/aggregation.c b/src/aggregation.c
index e50557d9..db33c177 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -192,13 +192,21 @@ static int agg_instance_update (agg_instance_t *inst, /* {{{ */
   gauge_t *rate;
 
   if (ds->ds_num != 1)
-    return (-1);
+  {
+    ERROR ("aggregation plugin: The \"%s\" type (data set) has more than one "
+        "data source. This is currently not supported by this plugin. "
+        "Sorry.", ds->type);
+    return (EINVAL);
+  }
 
   rate = uc_get_rate (ds, vl);
   if (rate == NULL)
   {
-    ERROR ("aggregation plugin: uc_get_rate() failed.");
-    return (-1);
+    char ident[6 * DATA_MAX_NAME_LEN];
+    FORMAT_VL (ident, sizeof (ident), vl);
+    ERROR ("aggregation plugin: Unable to read the current rate of \"%s\".",
+        ident);
+    return (ENOENT);
   }
 
   if (isnan (rate[0]))