From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 17 Aug 2010 13:50:26 +0000 (+0200)
Subject: redis plugin: Add default configuration.
X-Git-Tag: collectd-5.0.0-beta0~50^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7983affe67549ba8d84606f5ada0b98325687d13;p=collectd.git

redis plugin: Add default configuration.
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index f16ebb1e..a95f56bc 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -3765,6 +3765,9 @@ which configures the connection parameters for this node.
     </Node>
   </Plugin>
 
+The information shown in the synopsis above is the I<default configuration>
+which is used by the plugin if no configuration is present.
+
 =over 4
 
 =item B<Node> I<Nodename>
diff --git a/src/redis.c b/src/redis.c
index 1c01c3c4..30bd8da3 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -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 {
@@ -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 */