From 13e2b6e5a5ff8dbb20e6e5e06058b3372d139b94 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 20 May 2015 14:17:10 -0500 Subject: [PATCH] write_redis: Replaced method for checking for a NULL value for the redis connection --- src/write_redis.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/write_redis.c b/src/write_redis.c index 43d71f8a..22e30abb 100644 --- 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->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", @@ -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); -- 2.11.0