projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92ba603
)
write_redis: Replaced method for checking for a NULL value for the redis connection
author
root
<root@r1lead.ice.americas.sgi.com>
Wed, 20 May 2015 19:17:10 +0000
(14:17 -0500)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 26 May 2015 12:13:27 +0000
(14:13 +0200)
src/write_redis.c
patch
|
blob
|
history
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
43d71f8
..
22e30ab
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-111,7
+111,15
@@
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 && node->conn->err)
+ if (node->conn == NULL)
+ {
+ ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: Unkown reason",
+ (node->host != NULL) ? node->host : "localhost",
+ (node->port != 0) ? node->port : 6379);
+ pthread_mutex_unlock (&node->lock);
+ return (-1);
+ }
+ else if (node->conn->err)
{
ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: %s",
(node->host != NULL) ? node->host : "localhost",
{
ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: %s",
(node->host != NULL) ? node->host : "localhost",
@@
-122,7
+130,6
@@
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)
WARNING("ZADD command error. key:%s message:%s", key, node->conn->errstr);
rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
if (rr==NULL)
WARNING("ZADD command error. key:%s message:%s", key, node->conn->errstr);