X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fredis.c;h=b694e09db8f84a6be6767b20cacd50d37791b074;hb=aff80830f1154a5b6c4da16a0b1033aafde14e24;hp=dfac6d630190cda73e970970d09f3359c5cf8a84;hpb=272fd122c536588e4d196ee098705c482aee13e3;p=collectd.git

diff --git a/src/redis.c b/src/redis.c
index dfac6d63..b694e09d 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -24,187 +24,150 @@
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
-#include "utils_avltree.h"
 
 #include <pthread.h>
 #include <credis.h>
 
-#define REDIS_DEF_HOST "127.0.0.1"
-#define REDIS_DEF_PORT 6379
+#define REDIS_DEF_HOST   "localhost"
+#define REDIS_DEF_PORT    6379
+#define REDIS_DEF_TIMEOUT 2000
 #define MAX_REDIS_NODE_NAME 64
 
 /* Redis plugin configuration example:
  *
  * <Plugin redis>
- *   <Node mynode>
- *     Host localhost
- *     Port 6379
+ *   <Node "mynode">
+ *     Host "localhost"
+ *     Port "6379"
  *     Timeout 2000
  *   </Node>
  * </Plugin>
  */
 
-static c_avl_tree_t *redis_tree = NULL;
-static pthread_mutex_t redis_lock = PTHREAD_MUTEX_INITIALIZER;
-
-typedef struct redis_node_s {
+struct redis_node_s;
+typedef struct redis_node_s redis_node_t;
+struct redis_node_s
+{
   char name[MAX_REDIS_NODE_NAME];
   char host[HOST_NAME_MAX];
   int port;
   int timeout;
-} redis_node_t;
 
-static int redis_config_node (redis_node_t *rn, oconfig_item_t *ci) /* {{{ */
+  redis_node_t *next;
+};
+
+static redis_node_t *nodes_head = NULL;
+
+static int redis_node_add (const redis_node_t *rn) /* {{{ */
 {
-  int i;
-  int status = 0;
+  redis_node_t *rn_copy;
+  redis_node_t *rn_ptr;
+
+  /* Check for duplicates first */
+  for (rn_ptr = nodes_head; rn_ptr != NULL; rn_ptr = rn_ptr->next)
+    if (strcmp (rn->name, rn_ptr->name) == 0)
+      break;
 
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
+  if (rn_ptr != NULL)
   {
-    WARNING ("redis plugin: The `Node' block needs exactly one string "
-        "argument.");
+    ERROR ("redis plugin: A node with the name `%s' already exists.",
+        rn->name);
     return (-1);
   }
 
-  if (ci->children_num < 1)
+  rn_copy = malloc (sizeof (*rn_copy));
+  if (rn_copy == NULL)
   {
-    WARNING ("redis plugin: The `Node' block needs at least one option.");
+    ERROR ("redis plugin: malloc failed adding redis_node to the tree.");
     return (-1);
   }
 
-  sstrncpy (rn->name, ci->values[0].value.string, sizeof (rn->name));
+  memcpy (rn_copy, rn, sizeof (*rn_copy));
+  rn_copy->next = NULL;
+
+  DEBUG ("redis plugin: Adding node \"%s\".", rn->name);
+
+  if (nodes_head == NULL)
+    nodes_head = rn_copy;
+  else
+  {
+    rn_ptr = nodes_head;
+    while (rn_ptr->next != NULL)
+      rn_ptr = rn_ptr->next;
+    rn_ptr->next = rn_copy;
+  }
+
+  return (0);
+} /* }}} */
+
+static int redis_config_node (oconfig_item_t *ci) /* {{{ */
+{
+  redis_node_t rn;
+  int i;
+  int status;
+
+  memset (&rn, 0, sizeof (rn));
+  sstrncpy (rn.host, REDIS_DEF_HOST, sizeof (rn.host));
+  rn.port = REDIS_DEF_PORT;
+  rn.timeout = REDIS_DEF_TIMEOUT;
+
+  status = cf_util_get_string_buffer (ci, rn.name, sizeof (rn.name));
+  if (status != 0)
+    return (status);
 
   for (i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *option = ci->children + i;
-    status = 0;
 
     if (strcasecmp ("Host", option->key) == 0)
-      status = cf_util_get_string_buffer (option, rn->host, HOST_NAME_MAX);
+      status = cf_util_get_string_buffer (option, rn.host, sizeof (rn.host));
     else if (strcasecmp ("Port", option->key) == 0)
-      status = rn->port = cf_util_get_port_number (option);
+    {
+      status = cf_util_get_port_number (option);
+      if (status > 0)
+      {
+        rn.port = status;
+        status = 0;
+      }
+    }
     else if (strcasecmp ("Timeout", option->key) == 0)
-      status = cf_util_get_int (option, &rn->timeout);
+      status = cf_util_get_int (option, &rn.timeout);
     else
-    {
       WARNING ("redis plugin: Option `%s' not allowed inside a `Node' "
-          "block.", option->key);
-      status = -1;
-    }
+          "block. I'll ignore this option.", option->key);
 
     if (status != 0)
       break;
   }
 
-  return (status);
-} /* }}} */
-
-static redis_node_t *redis_node_get (const char *name, redis_node_t *rn) /* {{{ */
-{
-  if (c_avl_get (redis_tree, name, (void *) rn) == 0)
-    return (rn);
-  else
-    return (NULL);
-} /* }}} */
-
-static int redis_node_add (const redis_node_t *rn) /* {{{ */
-{
-  int status;
-  redis_node_t *rn_copy = NULL;
-  redis_node_t *rn_ptr;
-  redis_node_t  rn_get;
-
-  rn_copy = (redis_node_t *) malloc (sizeof (redis_node_t));
-  if (rn_copy == NULL)
-  {
-    sfree (rn_copy);
-    ERROR ("redis plugin: malloc failed adding redis_node to the tree.");
-    return (-1);
-  }
-  memcpy (rn_copy, rn, sizeof (redis_node_t));
-  if (*rn_copy->name == '\0')
-  {
-    (void) strncpy(rn_copy->name, "default", MAX_REDIS_NODE_NAME); /* in theory never fails */
-  }
-
-  DEBUG ("redis plugin: adding entry `%s' to the tree.", rn_copy->name);
-
-  pthread_mutex_lock (&redis_lock);
-
-  if ( (rn_ptr = redis_node_get (rn_copy->name, &rn_get)) != NULL )
-  {
-    WARNING ("redis plugin: the node `%s' override a previous node with same node.", rn_copy->name);
-  }
-
-  status = c_avl_insert (redis_tree, rn_copy->name, rn_copy);
-  pthread_mutex_unlock (&redis_lock);
-
   if (status != 0)
-  {
-    ERROR ("redis plugin: c_avl_insert (%s) failed adding noew node.", rn_copy->name);
-    sfree (rn_copy);
-    return (-1);
-  }
+    return (status);
 
-  return (status);
-} /* }}} */
+  return (redis_node_add (&rn));
+} /* }}} int redis_config_node */
 
 static int redis_config (oconfig_item_t *ci) /* {{{ */
 {
-  int status;
   int i;
 
-  redis_node_t rn = {
-    .name = "",
-    .host = "",
-    .port = REDIS_DEF_PORT,
-    .timeout = 2000
-  };
-
-  if (redis_tree == NULL)
-  {
-    redis_tree = c_avl_create ((void *) strcmp);
-    if (redis_tree == NULL)
-    {
-      ERROR ("redis plugin: c_avl_create failed reading config.");
-      return (-1);
-    }
-  }
-
-  status = 0;
   for (i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *option = ci->children + i;
 
     if (strcasecmp ("Node", option->key) == 0)
-    {
-      if ( (status = redis_config_node (&rn, option)) == 0 )
-        status = redis_node_add (&rn);
-    }
-    else if (strcasecmp ("Host", option->key) == 0)
-      status = cf_util_get_string_buffer (option, rn.host, HOST_NAME_MAX);
-    else if (strcasecmp ("Port", option->key) == 0)
-      status = rn.port = cf_util_get_port_number (option);
-    else if (strcasecmp ("Timeout", option->key) == 0)
-      status = cf_util_get_int (option, &rn.timeout);
+      redis_config_node (option);
     else
-    {
       WARNING ("redis plugin: Option `%s' not allowed in redis"
-          " configuration.", option->key);
-      status = -1;
-    }
-
-
-    if (status != 0)
-      break;
+          " configuration. It will be ignored.", option->key);
   }
 
-  if ( status == 0 && *rn.name != '\0') {
-    status = redis_node_add (&rn);
+  if (nodes_head == NULL)
+  {
+    ERROR ("redis plugin: No valid node configuration could be found.");
+    return (ENOENT);
   }
 
-  return (status);
+  return (0);
 } /* }}} */
 
   __attribute__ ((nonnull(2)))
@@ -233,14 +196,14 @@ static void redis_submit_g (char *plugin_instance,
 } /* }}} */
 
   __attribute__ ((nonnull(2)))
-static void redis_submit_c (char *plugin_instance,
+static void redis_submit_d (char *plugin_instance,
     const char *type, const char *type_instance,
-    counter_t value) /* {{{ */
+    derive_t value) /* {{{ */
 {
   value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].counter = value;
+  values[0].derive = value;
 
   vl.values = values;
   vl.values_len = 1;
@@ -257,39 +220,44 @@ static void redis_submit_c (char *plugin_instance,
   plugin_dispatch_values (&vl);
 } /* }}} */
 
-static int redis_read (void) /* {{{ */
+static int redis_init (void) /* {{{ */
 {
-  REDIS rh;
-  REDIS_INFO info;
+  redis_node_t rn = { "default", REDIS_DEF_HOST, REDIS_DEF_PORT,
+    REDIS_DEF_TIMEOUT, /* next = */ NULL };
 
-  char key[64];
-  int status;
-  c_avl_iterator_t *iter;
+  if (nodes_head == NULL)
+    redis_node_add (&rn);
+
+  return (0);
+} /* }}} int redis_init */
+
+static int redis_read (void) /* {{{ */
+{
   redis_node_t *rn;
 
-  status = -1;
-  if ( (iter = c_avl_get_iterator (redis_tree)) == NULL )
+  for (rn = nodes_head; rn != NULL; rn = rn->next)
   {
-    ERROR ("redis plugin: unable to iterate redis tree.");
-    return (-1);
-  }
+    REDIS rh;
+    REDIS_INFO info;
 
-  while (c_avl_iterator_next (iter, (void *) &key, (void *) &rn) == 0)
-  {
-    DEBUG ("redis plugin: querying info from node `%s'.", rn->name);
+    int status;
 
-    if ( (rh = credis_connect (rn->host, rn->port, rn->timeout)) == NULL )
+    DEBUG ("redis plugin: querying info from node `%s' (%s:%d).", rn->name, rn->host, rn->port);
+
+    rh = credis_connect (rn->host, rn->port, rn->timeout);
+    if (rh == NULL)
     {
       ERROR ("redis plugin: unable to connect to node `%s' (%s:%d).", rn->name, rn->host, rn->port);
-      status = -1;
-      break;
+      continue;
     }
 
-    if ( (status = credis_info (rh, &info)) == -1 )
+    memset (&info, 0, sizeof (info));
+    status = credis_info (rh, &info);
+    if (status != 0)
     {
       WARNING ("redis plugin: unable to get info from node `%s'.", rn->name);
       credis_close (rh);
-      break;
+      continue;
     }
 
     /* typedef struct _cr_info {
@@ -316,23 +284,14 @@ static int redis_read (void) /* {{{ */
         info.total_connections_received, info.total_commands_processed,
         info.uptime_in_seconds);
 
-    redis_submit_g (rn->name, "connected_clients", NULL, info.connected_clients);
-    redis_submit_g (rn->name, "connected_slaves", NULL, info.connected_slaves);
-    redis_submit_g (rn->name, "used_memory", NULL, info.used_memory);
-    redis_submit_g (rn->name, "changes_since_last_save", NULL, info.changes_since_last_save);
-    redis_submit_g (rn->name, "bgsave_in_progress", NULL, info.bgsave_in_progress);
-    redis_submit_c (rn->name, "total_connections_received", NULL, info.total_connections_received);
-    redis_submit_c (rn->name, "total_commands_processed", NULL, info.total_commands_processed);
-    redis_submit_c (rn->name, "uptime_in_seconds", NULL, info.uptime_in_seconds);
+    redis_submit_g (rn->name, "current_connections", "clients", info.connected_clients);
+    redis_submit_g (rn->name, "current_connections", "slaves", info.connected_slaves);
+    redis_submit_g (rn->name, "memory", "used", info.used_memory);
+    redis_submit_g (rn->name, "volatile_changes", NULL, info.changes_since_last_save);
+    redis_submit_d (rn->name, "total_connections", NULL, info.total_connections_received);
+    redis_submit_d (rn->name, "total_operations", NULL, info.total_commands_processed);
 
     credis_close (rh);
-    status = 0;
-  }
-
-  c_avl_iterator_destroy(iter);
-  if ( status != 0 )
-  {
-    return (-1);
   }
 
   return 0;
@@ -342,6 +301,7 @@ static int redis_read (void) /* {{{ */
 void module_register (void) /* {{{ */
 {
   plugin_register_complex_config ("redis", redis_config);
+  plugin_register_init ("redis", redis_init);
   plugin_register_read ("redis", redis_read);
   /* TODO: plugin_register_write: one redis list per value id with
    * X elements */