X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=3b8addd2c02e63f9ea8725d2ba431d7253ffb36f;hb=78154d2a5ae84e8f45d4f9ce6a7519add74b4b30;hp=c995a906ed2399c0c6413f83300d96f493a68e16;hpb=b79847972128878c67655b9a0c89b481861ee45a;p=collectd.git

diff --git a/src/write_redis.c b/src/write_redis.c
index c995a906..3b8addd2 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -53,6 +53,7 @@ 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];
   size_t value_size;
@@ -60,47 +61,19 @@ static int wr_write (const data_set_t *ds, /* {{{ */
   int status;
   int i;
 
-  status = FORMAT_VL (value, sizeof (value), vl);
+  status = FORMAT_VL (ident, sizeof (ident), vl);
   if (status != 0)
     return (status);
-  ssnprintf (key, sizeof (key), "collectd/%s", value);
+  ssnprintf (key, sizeof (key), "collectd/%s", ident);
 
   memset (value, 0, sizeof (value));
   value_size = sizeof (value);
   value_ptr = &value[0];
 
-#define APPEND(...) do {                                             \
-  status = snprintf (value_ptr, value_size, __VA_ARGS__);            \
-  if (((size_t) status) > value_size)                                \
-  {                                                                  \
-    value_ptr += value_size;                                         \
-    value_size = 0;                                                  \
-  }                                                                  \
-  else                                                               \
-  {                                                                  \
-    value_ptr += status;                                             \
-    value_size -= status;                                            \
-  }                                                                  \
-} while (0)
-
-  APPEND ("%lu", (unsigned long) vl->time);
-  for (i = 0; i < ds->ds_num; i++)
-  {
-    if (ds->ds[i].type == DS_TYPE_COUNTER)
-      APPEND ("%llu", vl->values[i].counter);
-    else if (ds->ds[i].type == DS_TYPE_GAUGE)
-      APPEND ("%g", vl->values[i].gauge);
-    else if (ds->ds[i].type == DS_TYPE_DERIVE)
-      APPEND ("%"PRIi64, vl->values[i].derive);
-    else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
-      APPEND ("%"PRIu64, vl->values[i].absolute);
-    else
-      assert (23 == 42);
-  }
-
-#undef APPEND
-
+  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)
   {
@@ -120,6 +93,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);