X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fredis.c;h=b694e09db8f84a6be6767b20cacd50d37791b074;hb=59c7ee1cafaf53814838794908dd84f8101334c7;hp=1c01c3c4f77bf6b4cc404b0e071fc31b89b7784b;hpb=ab81f781b1baad179f2c96abf54138d8a7d43cc9;p=collectd.git

diff --git a/src/redis.c b/src/redis.c
index 1c01c3c4..b694e09d 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -196,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;
@@ -220,30 +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 };
 
-  int status;
+  if (nodes_head == NULL)
+    redis_node_add (&rn);
+
+  return (0);
+} /* }}} int redis_init */
+
+static int redis_read (void) /* {{{ */
+{
   redis_node_t *rn;
 
   for (rn = nodes_head; rn != NULL; rn = rn->next)
   {
+    REDIS rh;
+    REDIS_INFO info;
+
+    int status;
+
     DEBUG ("redis plugin: querying info from node `%s' (%s:%d).", rn->name, rn->host, rn->port);
 
-    if ( (rh = credis_connect (rn->host, rn->port, rn->timeout)) == NULL )
+    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 {
@@ -274,8 +288,8 @@ static int redis_read (void) /* {{{ */
     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_c (rn->name, "total_connections", NULL, info.total_connections_received);
-    redis_submit_c (rn->name, "total_operations", NULL, info.total_commands_processed);
+    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);
   }
@@ -287,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 */