From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 12 Aug 2009 13:08:40 +0000 (+0200)
Subject: libvirt plugin: Further improve the connection handling.
X-Git-Tag: collectd-4.6.5~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=633b8c6bbac1c6de6c675f28e428b7415e283d64;p=collectd.git

libvirt plugin: Further improve the connection handling.

Use the complaint mechanism for failed connection attempts and handle multiple
`Connection' configuration options like other options in other plugins (i. e.
later options overwrite earlier settings of the same name).
---

diff --git a/src/libvirt.c b/src/libvirt.c
index 6ba08fbc..6f9e5f12 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -24,6 +24,7 @@
 #include "plugin.h"
 #include "configfile.h"
 #include "utils_ignorelist.h"
+#include "utils_complain.h"
 
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
@@ -50,7 +51,7 @@ static const char *config_keys[] = {
 /* Connection. */
 static virConnectPtr conn = 0;
 static char *conn_string = NULL;
-static int conn_count = 0;
+static c_complain_t conn_complain = C_COMPLAIN_INIT_STATIC;
 
 /* Seconds between list refreshes, 0 disables completely. */
 static int interval = 60;
@@ -155,15 +156,13 @@ lv_config (const char *key, const char *value)
         il_interface_devices = ignorelist_create (1);
 
     if (strcasecmp (key, "Connection") == 0) {
-        if (conn_count++ != 0) {
-            ERROR ("Connection may only be given once in config file");
-            return 1;
-        }
-        conn_string = strdup(value);
-        if (conn_string == NULL) {
+        char *tmp = strdup (value);
+        if (tmp == NULL) {
             ERROR ("libvirt plugin: Connection strdup failed.");
-            return -1;
+            return 1;
         }
+        sfree (conn_string);
+        conn_string = tmp;
         return 0;
     }
 
@@ -255,12 +254,17 @@ lv_read (void)
     int i;
 
     if (conn == NULL) {
+        /* `conn_string == NULL' is acceptable. */
         conn = virConnectOpenReadOnly (conn_string);
         if (conn == NULL) {
-            ERROR ("libvirt plugin: Not connected.");
+            c_complain (LOG_ERR, &conn_complain,
+                    "libvirt plugin: Unable to connect: "
+                    "virConnectOpenReadOnly failed.");
             return -1;
         }
     }
+    c_release (LOG_NOTICE, &conn_complain,
+            "libvirt plugin: Connection established.");
 
     time (&t);