X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fwrite_redis.c;h=0a5c5df1f677d0a8dcce6c394319fb43d19fac9f;hp=472241623dd51b02890c9f9324dae3a9a6ec9b56;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=3d74a63ae43c1786eb9b966e2209c24c5643dae8

diff --git a/src/write_redis.c b/src/write_redis.c
index 47224162..c17654b4 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -26,18 +26,17 @@
 
 #include "collectd.h"
 
-#include "plugin.h"
 #include "common.h"
+#include "plugin.h"
 
-#include <sys/time.h>
 #include <hiredis/hiredis.h>
+#include <sys/time.h>
 
 #ifndef REDIS_DEFAULT_PREFIX
-# define REDIS_DEFAULT_PREFIX "collectd/"
+#define REDIS_DEFAULT_PREFIX "collectd/"
 #endif
 
-struct wr_node_s
-{
+struct wr_node_s {
   char name[DATA_MAX_NAME_LEN];
 
   char *host;
@@ -46,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;
@@ -56,121 +56,132 @@ typedef struct wr_node_s wr_node_t;
 /*
  * Functions
  */
-static int wr_write (const data_set_t *ds, /* {{{ */
-    const value_list_t *vl,
-    user_data_t *ud)
-{
+static int wr_write(const data_set_t *ds, /* {{{ */
+                    const value_list_t *vl, user_data_t *ud) {
   wr_node_t *node = ud->data;
   char ident[512];
   char key[512];
-  char value[512] = { 0 };
+  char value[512] = {0};
   char time[24];
   size_t value_size;
   char *value_ptr;
   int status;
-  redisReply   *rr;
+  redisReply *rr;
 
-  status = FORMAT_VL (ident, sizeof (ident), vl);
+  status = FORMAT_VL(ident, sizeof(ident), vl);
   if (status != 0)
-    return (status);
-  ssnprintf (key, sizeof (key), "%s%s",
-      (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX,
-      ident);
-  ssnprintf (time, sizeof (time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
+    return status;
+  snprintf(key, sizeof(key), "%s%s",
+           (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX, ident);
+  snprintf(time, sizeof(time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
 
-  value_size = sizeof (value);
+  value_size = sizeof(value);
   value_ptr = &value[0];
-  status = format_values (value_ptr, value_size, ds, vl, node->store_rates);
+  status = format_values(value_ptr, value_size, ds, vl, node->store_rates);
   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)
-    {
-      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",
+    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) {
+      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);
+          (node->port != 0) ? node->port : 6379, node->conn->errstr);
+      pthread_mutex_unlock(&node->lock);
+      return -1;
     }
 
     rr = redisCommand(node->conn, "SELECT %d", node->database);
     if (rr == NULL)
-      WARNING("SELECT command error. database:%d message:%s", node->database, node->conn->errstr);
+      WARNING("SELECT command error. database:%d message:%s", node->database,
+              node->conn->errstr);
     else
-      freeReplyObject (rr);
+      freeReplyObject(rr);
   }
 
-  rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
+  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);
+    freeReplyObject(rr);
+
+  if (node->max_set_size >= 0) {
+    rr = redisCommand(node->conn, "ZREMRANGEBYRANK %s %d %d", key, 0,
+                      (-1 * node->max_set_size) - 1);
+    if (rr == NULL)
+      WARNING("ZREMRANGEBYRANK command error. key:%s message:%s", key,
+              node->conn->errstr);
+    else
+      freeReplyObject(rr);
+  }
 
-  if (node->max_set_size >= 0)
-  {
-    rr = redisCommand (node->conn, "ZREMRANGEBYRANK %s %d %d", key, 0, (-1 * node->max_set_size) - 1);
+  if (node->max_set_duration > 0) {
+    /*
+     * remove element, scored less than 'current-max_set_duration'
+     * '(...' indicates 'less than' in redis CLI.
+     */
+    rr = redisCommand(node->conn, "ZREMRANGEBYSCORE %s -1 (%.9f", key,
+                      (CDTIME_T_TO_DOUBLE(vl->time) - node->max_set_duration));
     if (rr == NULL)
-      WARNING("ZREMRANGEBYRANK command error. key:%s message:%s", key, node->conn->errstr);
+      WARNING("ZREMRANGEBYSCORE command error. key:%s message:%s", key,
+              node->conn->errstr);
     else
-      freeReplyObject (rr);
+      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 %svalues %s",
-      (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX,
-      ident);
-  if (rr==NULL)
-    WARNING("SADD command error. ident:%s message:%s", ident, node->conn->errstr);
+  rr = redisCommand(
+      node->conn, "SADD %svalues %s",
+      (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX, ident);
+  if (rr == NULL)
+    WARNING("SADD command error. ident:%s message:%s", ident,
+            node->conn->errstr);
   else
-    freeReplyObject (rr);
+    freeReplyObject(rr);
 
-  pthread_mutex_unlock (&node->lock);
+  pthread_mutex_unlock(&node->lock);
 
-  return (0);
+  return 0;
 } /* }}} int wr_write */
 
-static void wr_config_free (void *ptr) /* {{{ */
+static void wr_config_free(void *ptr) /* {{{ */
 {
   wr_node_t *node = ptr;
 
   if (node == NULL)
     return;
 
-  if (node->conn != NULL)
-  {
-    redisFree (node->conn);
+  if (node->conn != NULL) {
+    redisFree(node->conn);
     node->conn = NULL;
   }
 
-  sfree (node->host);
-  sfree (node);
+  sfree(node->host);
+  sfree(node);
 } /* }}} void wr_config_free */
 
-static int wr_config_node (oconfig_item_t *ci) /* {{{ */
+static int wr_config_node(oconfig_item_t *ci) /* {{{ */
 {
   wr_node_t *node;
   int timeout;
   int status;
 
-  node = calloc (1, sizeof (*node));
+  node = calloc(1, sizeof(*node));
   if (node == NULL)
-    return (ENOMEM);
+    return ENOMEM;
   node->host = NULL;
   node->port = 0;
   node->timeout.tv_sec = 0;
@@ -179,94 +190,83 @@ static int wr_config_node (oconfig_item_t *ci) /* {{{ */
   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));
-  if (status != 0)
-  {
-    sfree (node);
-    return (status);
+  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));
+  if (status != 0) {
+    sfree(node);
+    return status;
   }
 
-  for (int i = 0; i < ci->children_num; i++)
-  {
+  for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *child = ci->children + i;
 
-    if (strcasecmp ("Host", child->key) == 0)
-      status = cf_util_get_string (child, &node->host);
-    else if (strcasecmp ("Port", child->key) == 0)
-    {
-      status = cf_util_get_port_number (child);
-      if (status > 0)
-      {
+    if (strcasecmp("Host", child->key) == 0)
+      status = cf_util_get_string(child, &node->host);
+    else if (strcasecmp("Port", child->key) == 0) {
+      status = cf_util_get_port_number(child);
+      if (status > 0) {
         node->port = status;
         status = 0;
       }
-    }
-    else if (strcasecmp ("Timeout", child->key) == 0) {
-      status = cf_util_get_int (child, &timeout);
-      if (status == 0) node->timeout.tv_usec = timeout;
-    }
-    else if (strcasecmp ("Prefix", child->key) == 0) {
-      status = cf_util_get_string (child, &node->prefix);
-    }
-    else if (strcasecmp ("Database", child->key) == 0) {
-      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 ("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 if (strcasecmp("Timeout", child->key) == 0) {
+      status = cf_util_get_int(child, &timeout);
+      if (status == 0)
+        node->timeout.tv_usec = timeout;
+    } else if (strcasecmp("Prefix", child->key) == 0) {
+      status = cf_util_get_string(child, &node->prefix);
+    } else if (strcasecmp("Database", child->key) == 0) {
+      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
+      WARNING("write_redis plugin: Ignoring unknown config option \"%s\".",
+              child->key);
 
     if (status != 0)
       break;
   } /* for (i = 0; i < ci->children_num; i++) */
 
-  if (status == 0)
-  {
-    char cb_name[DATA_MAX_NAME_LEN];
+  if (status == 0) {
+    char cb_name[sizeof("write_redis/") + DATA_MAX_NAME_LEN];
 
-    ssnprintf (cb_name, sizeof (cb_name), "write_redis/%s", node->name);
+    snprintf(cb_name, sizeof(cb_name), "write_redis/%s", node->name);
 
-    user_data_t ud = {
-      .data = node,
-      .free_func = wr_config_free
-    };
-
-    status = plugin_register_write (cb_name, wr_write, &ud);
+    status =
+        plugin_register_write(cb_name, wr_write,
+                              &(user_data_t){
+                                  .data = node, .free_func = wr_config_free,
+                              });
   }
 
   if (status != 0)
-    wr_config_free (node);
+    wr_config_free(node);
 
-  return (status);
+  return status;
 } /* }}} int wr_config_node */
 
-static int wr_config (oconfig_item_t *ci) /* {{{ */
+static int wr_config(oconfig_item_t *ci) /* {{{ */
 {
-  for (int i = 0; i < ci->children_num; i++)
-  {
+  for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *child = ci->children + i;
 
-    if (strcasecmp ("Node", child->key) == 0)
-      wr_config_node (child);
+    if (strcasecmp("Node", child->key) == 0)
+      wr_config_node(child);
     else
-      WARNING ("write_redis plugin: Ignoring unknown "
-          "configuration option \"%s\" at top level.", child->key);
+      WARNING("write_redis plugin: Ignoring unknown "
+              "configuration option \"%s\" at top level.",
+              child->key);
   }
 
-  return (0);
+  return 0;
 } /* }}} int wr_config */
 
-void module_register (void)
-{
-  plugin_register_complex_config ("write_redis", wr_config);
+void module_register(void) {
+  plugin_register_complex_config("write_redis", wr_config);
 }
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */