X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=ecbea4e24946b0f72bfdd10b08ca8acd8a878f13;hb=39bfd94dd45dd8a20318cf8fd01da0b9467d5da6;hp=0b15e0fa95c4e2e37d3ee973bbfca9a47976fe9d;hpb=53181fa3b5a91f47e51d01d56b34906f8b244a1b;p=collectd.git

diff --git a/src/write_redis.c b/src/write_redis.c
index 0b15e0fa..ecbea4e2 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -53,39 +53,26 @@ static int wr_write (const data_set_t *ds, /* {{{ */
     user_data_t *ud)
 {
   wr_node_t *node = ud->data;
+  char ident[512];
   char key[512];
   char value[512];
-  char tmp[512];
+  size_t value_size;
+  char *value_ptr;
   int status;
-  int i;
 
-  status = FORMAT_VL (tmp, sizeof (tmp), vl);
+  status = FORMAT_VL (ident, sizeof (ident), vl);
   if (status != 0)
     return (status);
-  ssnprintf (key, sizeof (key), "collectd/%s", tmp);
-
-  ssnprintf (value, sizeof (value), "%lu", (unsigned long) vl->time);
-  for (i = 0; i < ds->ds_num; i++)
-  {
-    if (ds->ds[i].type == DS_TYPE_COUNTER)
-      ssnprintf (tmp, sizeof (tmp), "%s:%llu",
-          value, vl->values[i].counter);
-    else if (ds->ds[i].type == DS_TYPE_GAUGE)
-      ssnprintf (tmp, sizeof (tmp), "%s:%g",
-          value, vl->values[i].gauge);
-    else if (ds->ds[i].type == DS_TYPE_DERIVE)
-      ssnprintf (tmp, sizeof (tmp), "%s:%"PRIi64,
-          value, vl->values[i].derive);
-    else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
-      ssnprintf (tmp, sizeof (tmp), "%s:%"PRIu64,
-          value, vl->values[i].absolute);
-    else
-      assert (23 == 42);
+  ssnprintf (key, sizeof (key), "collectd/%s", ident);
 
-    memcpy (value, tmp, sizeof (value));
-  }
+  memset (value, 0, sizeof (value));
+  value_size = sizeof (value);
+  value_ptr = &value[0];
 
+  status = format_values (value_ptr, value_size, ds, vl, /* store rates = */ 0);
   pthread_mutex_lock (&node->lock);
+  if (status != 0)
+    return (status);
 
   if (node->conn == NULL)
   {
@@ -105,6 +92,8 @@ static int wr_write (const data_set_t *ds, /* {{{ */
   assert (node->conn != NULL);
   status = credis_zadd (node->conn, key, (double) vl->time, value);
 
+  credis_sadd (node->conn, "collectd/values", ident);
+
   pthread_mutex_unlock (&node->lock);
 
   return (0);