X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=a361501d0ff1a8e596143d2326684b3d409d86fb;hb=ae966c608727daec7c78a0e18a812c9439a8d5e0;hp=19f351abc3dc17329676ea77a193b635bc07d693;hpb=b423bd090e6a1af51446ad6967d5016045bd6ea5;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 19f351ab..a361501d 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -204,15 +204,23 @@ static int value_list_to_string (char *buffer, int buffer_len,
 	for (i = 0; i < ds->ds_num; i++)
 	{
 		if ((ds->ds[i].type != DS_TYPE_COUNTER)
-				&& (ds->ds[i].type != DS_TYPE_GAUGE))
+				&& (ds->ds[i].type != DS_TYPE_GAUGE)
+				&& (ds->ds[i].type != DS_TYPE_DERIVE)
+				&& (ds->ds[i].type != DS_TYPE_ABSOLUTE))
 			return (-1);
 
 		if (ds->ds[i].type == DS_TYPE_COUNTER)
 			status = ssnprintf (buffer + offset, buffer_len - offset,
 					":%llu", vl->values[i].counter);
-		else
+		else if (ds->ds[i].type == DS_TYPE_GAUGE)
 			status = ssnprintf (buffer + offset, buffer_len - offset,
 					":%lf", vl->values[i].gauge);
+		else if (ds->ds[i].type == DS_TYPE_DERIVE)
+			status = ssnprintf (buffer + offset, buffer_len - offset,
+					":%llu", vl->values[i].derive);
+		else /*if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */
+			status = ssnprintf (buffer + offset, buffer_len - offset,
+					":%llu", vl->values[i].absolute);
 
 		if ((status < 1) || (status >= (buffer_len - offset)))
 			return (-1);
@@ -283,6 +291,9 @@ static void *rrd_queue_thread (void __attribute__((unused)) *data)
 		int    status;
 		int    i;
 
+		values = NULL;
+		values_num = 0;
+
                 pthread_mutex_lock (&queue_lock);
                 /* Wait for values to arrive */
                 while (true)
@@ -598,7 +609,7 @@ static int rrd_cache_flush_identifier (int timeout, const char *identifier)
   status = c_avl_get (cache, key, (void *) &rc);
   if (status != 0)
   {
-    WARNING ("rrdtool plugin: rrd_cache_flush_identifier: "
+    INFO ("rrdtool plugin: rrd_cache_flush_identifier: "
         "c_avl_get (%s) failed. Does that file really exist?",
         key);
     return (status);
@@ -1022,8 +1033,13 @@ static int rrd_shutdown (void)
 
 static int rrd_init (void)
 {
+	static int init_once = 0;
 	int status;
 
+	if (init_once != 0)
+		return (0);
+	init_once = 1;
+
 	if (rrdcreate_config.stepsize < 0)
 		rrdcreate_config.stepsize = 0;
 	if (rrdcreate_config.heartbeat <= 0)