projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4'
[collectd.git]
/
src
/
write_redis.c
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
1b12745
..
b4c5e21
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-57,6
+57,7
@@
static int wr_write (const data_set_t *ds, /* {{{ */
char ident[512];
char key[512];
char value[512];
char ident[512];
char key[512];
char value[512];
+ char time[24];
size_t value_size;
char *value_ptr;
int status;
size_t value_size;
char *value_ptr;
int status;
@@
-67,6
+68,7
@@
static int wr_write (const data_set_t *ds, /* {{{ */
if (status != 0)
return (status);
ssnprintf (key, sizeof (key), "collectd/%s", ident);
if (status != 0)
return (status);
ssnprintf (key, sizeof (key), "collectd/%s", ident);
+ ssnprintf (time, sizeof (time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
memset (value, 0, sizeof (value));
value_size = sizeof (value);
memset (value, 0, sizeof (value));
value_size = sizeof (value);
@@
-86,7
+88,8
@@
static int wr_write (const data_set_t *ds, /* {{{ */
} \
} while (0)
} \
} while (0)
- APPEND ("%lu", (unsigned long) vl->time);
+ APPEND ("%s:", time);
+
for (i = 0; i < ds->ds_num; i++)
{
if (ds->ds[i].type == DS_TYPE_COUNTER)
for (i = 0; i < ds->ds_num; i++)
{
if (ds->ds[i].type == DS_TYPE_COUNTER)
@@
-119,12
+122,11
@@
static int wr_write (const data_set_t *ds, /* {{{ */
}
assert (node->conn != NULL);
}
assert (node->conn != NULL);
- rr = redisCommand (node->conn, "ZADD %b %f %b", key, sizeof (key),
- (double) vl->time, value, sizeof (value));
+ rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
if (rr==NULL)
WARNING("ZADD command error. key:%s", key);
if (rr==NULL)
WARNING("ZADD command error. key:%s", key);
- rr = redisCommand (node->conn, "SADD collectd/values %
b", ident, sizeof(ident)
);
+ rr = redisCommand (node->conn, "SADD collectd/values %
s", ident
);
if (rr==NULL)
WARNING("SADD command error. ident:%s", ident);
if (rr==NULL)
WARNING("SADD command error. ident:%s", ident);