Merge branch 'pull/collectd-4' into collectd-4

diff --git a/src/csv.c b/src/csv.c
index e67a9ca..5d64fb8 100644 (file)
--- a/src/csv.c
+++ b/src/csv.c
@@ -201,7 +201,7 @@ static int csv_write (const data_set_t *ds, const value_list_t *vl)
        if (value_list_to_filename (filename, sizeof (filename), ds, vl) != 0)
                return (-1);
 
-       DEBUG ("filename = %s;", filename);
+       DEBUG ("csv plugin: csv_write: filename = %s;", filename);
 
        if (value_list_to_string (values, sizeof (values), ds, vl) != 0)
                return (-1);

diff --git a/src/unixsock.c b/src/unixsock.c
index aa5b67c..8524bea 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -150,7 +150,8 @@ static int cache_insert (const data_set_t *ds, const value_list_t *vl)
        value_cache_t *vc;
        int i;
 
-       DEBUG ("ds->ds_num = %i; vl->values_len = %i;",
+       DEBUG ("unixsock plugin: cache_insert: ds->ds_num = %i;"
+                       " vl->values_len = %i;",
                        ds->ds_num, vl->values_len);
        assert (ds->ds_num == vl->values_len);