From: Dagobert Michelsen <dam@opencsw.org>
Date: Tue, 25 Feb 2020 15:11:55 +0000 (+0100)
Subject: Fix error/warning messages to contain more information
X-Git-Tag: collectd-5.11.0~26^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75573d48d928ee9883e232899d4d2000b30e6e29;p=thirdparty%2Fcollectd.git

Fix error/warning messages to contain more information
---

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 52cb0a4b7..42b124f59 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -2122,7 +2122,8 @@ static int plugin_dispatch_values_internal(value_list_t *vl) {
   assert(0 == strcmp(ds->type, vl->type));
 #else
   if (0 != strcmp(ds->type, vl->type))
-    WARNING("plugin_dispatch_values: (ds->type = %s) != (vl->type = %s)",
+    WARNING("plugin_dispatch_values: <%s/%s-%s> (ds->type = %s) != (vl->type = %s)",
+            vl->host, vl->plugin, vl->plugin_instance,
             ds->type, vl->type);
 #endif
 
@@ -2130,9 +2131,11 @@ static int plugin_dispatch_values_internal(value_list_t *vl) {
   assert(ds->ds_num == vl->values_len);
 #else
   if (ds->ds_num != vl->values_len) {
-    ERROR("plugin_dispatch_values: ds->type = %s: "
+    ERROR("plugin_dispatch_values: <%s/%s-%s/%s-%s> ds->type = %s: "
           "(ds->ds_num = %" PRIsz ") != "
           "(vl->values_len = %" PRIsz ")",
+          vl->host, vl->plugin, vl->plugin_instance,
+          vl->type, vl->type_instance,
           ds->type, ds->ds_num, vl->values_len);
     return -1;
   }