projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1455 from rubenk/configure-ac-remove-dead-code
[collectd.git]
/
src
/
write_redis.c
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
eb4e2c5
..
4bfcc73
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-47,6
+47,7
@@
struct wr_node_s
char *prefix;
int database;
int max_set_size;
char *prefix;
int database;
int max_set_size;
+ _Bool store_rates;
redisContext *conn;
pthread_mutex_t lock;
redisContext *conn;
pthread_mutex_t lock;
@@
-81,11
+82,12
@@
static int wr_write (const data_set_t *ds, /* {{{ */
memset (value, 0, sizeof (value));
value_size = sizeof (value);
value_ptr = &value[0];
memset (value, 0, sizeof (value));
value_size = sizeof (value);
value_ptr = &value[0];
- status = format_values (value_ptr, value_size, ds, vl, /* store rates = */ 0);
- pthread_mutex_lock (&node->lock);
+ status = format_values (value_ptr, value_size, ds, vl, node->store_rates);
if (status != 0)
return (status);
if (status != 0)
return (status);
+ pthread_mutex_lock (&node->lock);
+
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);
@@
-124,7
+126,7
@@
static int wr_write (const data_set_t *ds, /* {{{ */
{
rr = redisCommand (node->conn, "ZREMRANGEBYRANK %s %d %d", key, 0, (-1 * node->max_set_size) - 1);
if (rr == NULL)
{
rr = redisCommand (node->conn, "ZREMRANGEBYRANK %s %d %d", key, 0, (-1 * node->max_set_size) - 1);
if (rr == NULL)
- WARNING("ZREMRANGEBYRANK command error.
database:%d message:%s", node->database
, node->conn->errstr);
+ WARNING("ZREMRANGEBYRANK command error.
key:%s message:%s", key
, node->conn->errstr);
else
freeReplyObject (rr);
}
else
freeReplyObject (rr);
}
@@
-181,6
+183,7
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
node->prefix = NULL;
node->database = 0;
node->max_set_size = -1;
node->prefix = NULL;
node->database = 0;
node->max_set_size = -1;
+ node->store_rates = 1;
pthread_mutex_init (&node->lock, /* attr = */ NULL);
status = cf_util_get_string_buffer (ci, node->name, sizeof (node->name));
pthread_mutex_init (&node->lock, /* attr = */ NULL);
status = cf_util_get_string_buffer (ci, node->name, sizeof (node->name));
@@
-218,6
+221,9
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
else if (strcasecmp ("MaxSetSize", child->key) == 0) {
status = cf_util_get_int (child, &node->max_set_size);
}
else if (strcasecmp ("MaxSetSize", child->key) == 0) {
status = cf_util_get_int (child, &node->max_set_size);
}
+ else if (strcasecmp ("StoreRates", child->key) == 0) {
+ status = cf_util_get_boolean (child, &node->store_rates);
+ }
else
WARNING ("write_redis plugin: Ignoring unknown config option \"%s\".",
child->key);
else
WARNING ("write_redis plugin: Ignoring unknown config option \"%s\".",
child->key);