X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=09aae7028d24505a6f3cb372860b8eafb8d20a1e;hb=d3db12b73a1c3c17a2dfc0ba96ec99490088c957;hp=c995a906ed2399c0c6413f83300d96f493a68e16;hpb=b79847972128878c67655b9a0c89b481861ee45a;p=collectd.git diff --git a/src/write_redis.c b/src/write_redis.c index c995a906..09aae702 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,10 +61,10 @@ 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); @@ -83,13 +84,13 @@ static int wr_write (const data_set_t *ds, /* {{{ */ } \ } while (0) - APPEND ("%lu", (unsigned long) vl->time); + 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); + APPEND (GAUGE_FORMAT, 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) @@ -120,6 +121,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);