Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / tokyotyrant.c

diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index 977e11b59dd4e16d69d19386651036a1ea69853f..678a341c1ceeaf15f24a708d12567c1b8ed92f15 100644 (file)
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -24,6 +24,7 @@
 #include "common.h"
 #include "utils_cache.h"
 #include "utils_parse_option.h"
+
 #include <tcrdb.h>
 
 #define DEFAULT_HOST "127.0.0.1"
@@ -39,6 +40,8 @@ static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 static char *config_host = NULL;
 static char *config_port = NULL;
 
+static TCRDB *rdb = NULL;
+
 static int tt_config (const char *key, const char *value)
 {
        if (strcasecmp ("Host", key) == 0)
@@ -76,7 +79,7 @@ static int tt_config (const char *key, const char *value)
        return (0);
 }
 
-static void printerr(TCRDB *rdb)
+static void printerr()
 {
        int ecode = tcrdbecode(rdb);
        ERROR ("tokyotyrant plugin: error: %d, %s",
@@ -102,46 +105,68 @@ static void tt_submit (gauge_t val, const char* type)
        plugin_dispatch_values (&vl);
 }
 
-static int tt_read (void) {
-       gauge_t rnum, size;
+static void tt_open_db (void)
+{
+       char* host = NULL;
+       int   port = DEFAULT_PORT;
 
-        char* host = NULL;
-        int   port;
+       if (rdb != NULL)
+               return;
 
-        host = ((config_host != NULL) ? config_host : DEFAULT_HOST);
-        port = ((config_port != NULL) ? atoi(config_port) : DEFAULT_PORT);
+       host = ((config_host != NULL) ? config_host : DEFAULT_HOST);
 
-       TCRDB *rdb = tcrdbnew();
+       if (config_port != NULL)
+       {
+               port = service_name_to_port_number (config_port);
+               if (port <= 0)
+                       return;
+       }
 
-       if (!tcrdbopen(rdb, host, port))
+       rdb = tcrdbnew ();
+       if (rdb == NULL)
+               return;
+       else if (!tcrdbopen(rdb, host, port))
        {
-               printerr (rdb);
+               printerr ();
                tcrdbdel (rdb);
-               return (1);
+               rdb = NULL;
        }
+} /* void tt_open_db */
+
+static int tt_read (void) {
+       gauge_t rnum, size;
+
+       tt_open_db ();
+       if (rdb == NULL)
+               return (-1);
 
        rnum = tcrdbrnum(rdb);
-       size = tcrdbsize(rdb);
        tt_submit (rnum, "records");
-       tt_submit (size, "file_size");
 
-       if (!tcrdbclose(rdb))
-       {
-               printerr (rdb);
-               tcrdbdel (rdb);
-               return (1);
-       }
+       size = tcrdbsize(rdb);
+       tt_submit (size, "file_size");
 
-        tcrdbdel (rdb);
        return (0);
 }
 
 static int tt_shutdown(void)
 {
-        sfree(config_host);
-        sfree(config_port);
+       sfree(config_host);
+       sfree(config_port);
+
+       if (rdb != NULL)
+       {
+               if (!tcrdbclose(rdb))
+               {
+                       printerr ();
+                       tcrdbdel (rdb);
+                       return (1);
+               }
+               tcrdbdel (rdb);
+               rdb = NULL;
+       }
 
-        return(0);
+       return(0);
 }
 
 void module_register (void)
@@ -149,7 +174,7 @@ void module_register (void)
        plugin_register_config("tokyotyrant", tt_config,
                        config_keys, config_keys_num);
        plugin_register_read("tokyotyrant", tt_read);
-        plugin_register_shutdown("tokyotyrant", tt_shutdown);
+       plugin_register_shutdown("tokyotyrant", tt_shutdown);
 }
 
 /* vim: set sw=8 ts=8 tw=78 : */