X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=cdea3060023b462df6b7bdb0d40d0a64fad02b78;hb=dd09c9364998ad6ef681b70f45f7a9734808cf96;hp=61893ff3c14d615ce8cb6ed94784bb50ebdaac3a;hpb=5c416628a579131d57e75f217bfb7845a66fe62f;p=collectd.git diff --git a/src/write_redis.c b/src/write_redis.c index 61893ff3..cdea3060 100644 --- a/src/write_redis.c +++ b/src/write_redis.c @@ -1,6 +1,6 @@ /** * collectd - src/write_redis.c - * Copyright (C) 2010 Florian Forster + * Copyright (C) 2010 Florian Forster * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -30,7 +30,8 @@ #include "configfile.h" #include -#include +#include +#include struct wr_node_s { @@ -38,9 +39,9 @@ struct wr_node_s char *host; int port; - int timeout; + struct timeval timeout; - REDIS conn; + redisContext *conn; pthread_mutex_t lock; }; typedef struct wr_node_s wr_node_t; @@ -56,76 +57,63 @@ static int wr_write (const data_set_t *ds, /* {{{ */ char ident[512]; char key[512]; char value[512]; + char time[24]; size_t value_size; char *value_ptr; int status; - int i; + redisReply *rr; status = FORMAT_VL (ident, sizeof (ident), vl); 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); value_ptr = &value[0]; - -#define APPEND(...) do { \ - status = snprintf (value_ptr, value_size, __VA_ARGS__); \ - if (((size_t) status) > value_size) \ - { \ - value_ptr += value_size; \ - value_size = 0; \ - } \ - else \ - { \ - value_ptr += status; \ - value_size -= status; \ - } \ -} while (0) - - APPEND ("%.3f:", CDTIME_T_TO_DOUBLE (vl->time)); - for (i = 0; i < ds->ds_num; i++) - { - // Increase parsability by delimiting the individual values - if (ds->ds_num > 1 && i > 0) - APPEND ("%s", "|"); - - if (ds->ds[i].type == DS_TYPE_COUNTER) - APPEND ("%llu", vl->values[i].counter); - else if (ds->ds[i].type == DS_TYPE_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) - APPEND ("%"PRIu64, vl->values[i].absolute); - else - assert (23 == 42); - } - -#undef APPEND + status = format_values (value_ptr, value_size, ds, vl, /* store rates = */ 0); + if (status != 0) + return (status); pthread_mutex_lock (&node->lock); if (node->conn == NULL) { - node->conn = credis_connect (node->host, node->port, node->timeout); + node->conn = redisConnectWithTimeout ((char *)node->host, node->port, node->timeout); if (node->conn == NULL) { - ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed.", + ERROR ("write_redis plugin: Connecting to host \"%s\" (port %i) failed: Unknown 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", + (node->port != 0) ? node->port : 6379, + node->conn->errstr); + pthread_mutex_unlock (&node->lock); + return (-1); + } } - /* "credis_zadd" doesn't handle a NULL pointer gracefully, so I'd rather - * have a meaningful assertion message than a normal segmentation fault. */ - assert (node->conn != NULL); - status = credis_zadd (node->conn, key, (double) vl->time, value); - - credis_sadd (node->conn, "collectd/values", ident); + 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); + else + freeReplyObject (rr); + + /* TODO(octo): This is more overhead than necessary. Use the cache and + * metadata to determine if it is a new metric and call SADD only once for + * each metric. */ + rr = redisCommand (node->conn, "SADD collectd/values %s", ident); + if (rr==NULL) + WARNING("SADD command error. ident:%s message:%s", ident, node->conn->errstr); + else + freeReplyObject (rr); pthread_mutex_unlock (&node->lock); @@ -141,7 +129,7 @@ static void wr_config_free (void *ptr) /* {{{ */ if (node->conn != NULL) { - credis_close (node->conn); + redisFree (node->conn); node->conn = NULL; } @@ -152,6 +140,7 @@ static void wr_config_free (void *ptr) /* {{{ */ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ { wr_node_t *node; + int timeout; int status; int i; @@ -161,7 +150,8 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ memset (node, 0, sizeof (*node)); node->host = NULL; node->port = 0; - node->timeout = 1000; + node->timeout.tv_sec = 0; + node->timeout.tv_usec = 1000; node->conn = NULL; pthread_mutex_init (&node->lock, /* attr = */ NULL); @@ -187,8 +177,10 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */ status = 0; } } - else if (strcasecmp ("Timeout", child->key) == 0) - status = cf_util_get_int (child, &node->timeout); + else if (strcasecmp ("Timeout", child->key) == 0) { + status = cf_util_get_int (child, &timeout); + if (status == 0) node->timeout.tv_usec = timeout; + } else WARNING ("write_redis plugin: Ignoring unknown config option \"%s\".", child->key);