X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=97c6cc05bc3dea401de30e1b43ac7428528fe6ed;hb=6e41c3b1f024d7944e5e8010a87933555c662474;hp=5a029de2761a4c75c618ea8f11cd448831c1e1ff;hpb=7f38ca96e3a54a4b02475f857c7d79c6a1257ada;p=collectd.git

diff --git a/src/write_redis.c b/src/write_redis.c
index 5a029de2..97c6cc05 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -45,7 +45,8 @@ struct wr_node_s {
   char *prefix;
   int database;
   int max_set_size;
-  _Bool store_rates;
+  int max_set_duration;
+  bool store_rates;
 
   redisContext *conn;
   pthread_mutex_t lock;
@@ -125,6 +126,20 @@ static int wr_write(const data_set_t *ds, /* {{{ */
       freeReplyObject(rr);
   }
 
+  if (node->max_set_duration > 0) {
+    /*
+     * remove element, scored less than 'current-max_set_duration'
+     * '(%d' indicates 'less than' in redis CLI.
+     */
+    rr = redisCommand(node->conn, "ZREMRANGEBYSCORE %s -1 (%d", key,
+                      (time - node->max_set_duration) + 1);
+    if (rr == NULL)
+      WARNING("ZREMRANGEBYSCORE 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. */
@@ -175,7 +190,8 @@ static int wr_config_node(oconfig_item_t *ci) /* {{{ */
   node->prefix = NULL;
   node->database = 0;
   node->max_set_size = -1;
-  node->store_rates = 1;
+  node->max_set_duration = -1;
+  node->store_rates = true;
   pthread_mutex_init(&node->lock, /* attr = */ NULL);
 
   status = cf_util_get_string_buffer(ci, node->name, sizeof(node->name));
@@ -205,6 +221,8 @@ static int wr_config_node(oconfig_item_t *ci) /* {{{ */
       status = cf_util_get_int(child, &node->database);
     } else if (strcasecmp("MaxSetSize", child->key) == 0) {
       status = cf_util_get_int(child, &node->max_set_size);
+    } else if (strcasecmp("MaxSetDuration", child->key) == 0) {
+      status = cf_util_get_int(child, &node->max_set_duration);
     } else if (strcasecmp("StoreRates", child->key) == 0) {
       status = cf_util_get_boolean(child, &node->store_rates);
     } else