projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_redis: Log error message from redis command failures
[collectd.git]
/
src
/
write_redis.c
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
b4c5e21
..
43d71f8
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-95,7
+95,7
@@
static int wr_write (const data_set_t *ds, /* {{{ */
if (ds->ds[i].type == DS_TYPE_COUNTER)
APPEND ("%llu", vl->values[i].counter);
else if (ds->ds[i].type == DS_TYPE_GAUGE)
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)
else if (ds->ds[i].type == DS_TYPE_DERIVE)
APPEND ("%"PRIi64, vl->values[i].derive);
else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
@@
-111,11
+111,12
@@
static int wr_write (const data_set_t *ds, /* {{{ */
if (node->conn == NULL)
{
node->conn = redisConnectWithTimeout ((char *)node->host, node->port, node->timeout);
if (node->conn == NULL)
{
node->conn = redisConnectWithTimeout ((char *)node->host, node->port, node->timeout);
- if (node->conn
== NULL
)
+ if (node->conn
!= NULL && node->conn->err
)
{
{
- ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed
.
",
+ ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed
: %s
",
(node->host != NULL) ? node->host : "localhost",
(node->host != NULL) ? node->host : "localhost",
- (node->port != 0) ? node->port : 6379);
+ (node->port != 0) ? node->port : 6379,
+ node->conn->errstr);
pthread_mutex_unlock (&node->lock);
return (-1);
}
pthread_mutex_unlock (&node->lock);
return (-1);
}
@@
-124,11
+125,11
@@
static int wr_write (const data_set_t *ds, /* {{{ */
assert (node->conn != NULL);
rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
if (rr==NULL)
assert (node->conn != NULL);
rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
if (rr==NULL)
- WARNING("ZADD command error. key:%s
", key
);
+ WARNING("ZADD command error. key:%s
message:%s", key, node->conn->errstr
);
rr = redisCommand (node->conn, "SADD collectd/values %s", ident);
if (rr==NULL)
rr = redisCommand (node->conn, "SADD collectd/values %s", ident);
if (rr==NULL)
- WARNING("SADD command error. ident:%s
", ident
);
+ WARNING("SADD command error. ident:%s
message:%s", ident, node->conn->errstr
);
pthread_mutex_unlock (&node->lock);
pthread_mutex_unlock (&node->lock);