X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fbackend%2Fcollectd%2Funixsock.c;h=8ac829d117c85c5ccae04bba44be92da7aa13c0f;hb=a0c8961e4732d71aaed1f4cda663203ff722b23e;hp=7e4f73a2d20bfab567f116446f5caed1dd37c33b;hpb=85d24495a23b26c7a1af8f21a122dc304a70f54b;p=sysdb.git

diff --git a/src/backend/collectd/unixsock.c b/src/backend/collectd/unixsock.c
index 7e4f73a..8ac829d 100644
--- a/src/backend/collectd/unixsock.c
+++ b/src/backend/collectd/unixsock.c
@@ -25,10 +25,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
 #include "core/plugin.h"
 #include "core/store.h"
-#include "core/error.h"
+#include "utils/error.h"
 #include "utils/unixsock.h"
 
 #include "liboconfig/utils.h"
@@ -59,11 +63,38 @@ typedef struct {
  * private helper functions
  */
 
+/* store the specified host-name (once per iteration) */
 static int
-sdb_collectd_add_host(const char *hostname, sdb_time_t last_update)
+sdb_collectd_store_host(sdb_collectd_state_t *state,
+		const char *hostname, sdb_time_t last_update)
 {
 	int status;
 
+	if (last_update > state->current_timestamp)
+		state->current_timestamp = last_update;
+
+	if (state->current_host && (! strcasecmp(state->current_host, hostname)))
+		return 0;
+	/* else: first/new host */
+
+	if (state->current_host) {
+		sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
+				"%i service%s (%i failed) for host '%s'.",
+				state->svc_updated, state->svc_updated == 1 ? "" : "s",
+				state->svc_failed, state->current_host);
+		state->svc_updated = state->svc_failed = 0;
+		free(state->current_host);
+	}
+
+	state->current_host = strdup(hostname);
+	if (! state->current_host) {
+		char errbuf[1024];
+		sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to allocate "
+				"string buffer: %s",
+				sdb_strerror(errno, errbuf, sizeof(errbuf)));
+		return -1;
+	}
+
 	status = sdb_store_host(hostname, last_update);
 
 	if (status < 0) {
@@ -78,29 +109,21 @@ sdb_collectd_add_host(const char *hostname, sdb_time_t last_update)
 			"host '%s' (last update timestamp = %"PRIscTIME").",
 			hostname, last_update);
 	return 0;
-} /* sdb_collectd_add_host */
+} /* sdb_collectd_store_host */
 
 static int
 sdb_collectd_add_svc(const char *hostname, const char *plugin,
 		const char *type, sdb_time_t last_update)
 {
-	sdb_service_t svc = SDB_SVC_INIT;
-	char host[strlen(hostname) + 1];
 	char name[strlen(plugin) + strlen(type) + 2];
+	int  status;
 
-	int status;
-
-	strncpy(host, hostname, sizeof(host));
 	snprintf(name, sizeof(name), "%s/%s", plugin, type);
 
-	svc.hostname = host;
-	SDB_OBJ(&svc)->name = name;
-	svc._last_update = last_update;
-
-	status = sdb_store_service(&svc);
+	status = sdb_store_service(hostname, name, last_update);
 	if (status < 0) {
 		sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to "
-				"store/update service '%s/%s'.", host, name);
+				"store/update service '%s/%s'.", hostname, name);
 		return -1;
 	}
 	return 0;
@@ -131,46 +154,13 @@ sdb_collectd_get_data(sdb_unixsock_client_t __attribute__((unused)) *client,
 	type     = data[3].data.string;
 
 	state = SDB_OBJ_WRAPPER(user_data)->data;
-
-	if (! state->current_host) {
-		state->current_host = strdup(hostname);
-		state->current_timestamp = last_update;
-	}
-
-	if (! state->current_host) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to allocate "
-				"string buffer: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
+	if (sdb_collectd_store_host(state, hostname, last_update))
 		return -1;
-	}
-
-	if (! sdb_store_get_host(hostname))
-		sdb_collectd_add_host(hostname, last_update);
 
 	if (sdb_collectd_add_svc(hostname, plugin, type, last_update))
 		++state->svc_failed;
 	else
 		++state->svc_updated;
-
-	if (! strcasecmp(state->current_host, hostname)) {
-		if (last_update > state->current_timestamp)
-			state->current_timestamp = last_update;
-		return 0;
-	}
-
-	/* new host */
-	sdb_collectd_add_host(hostname, last_update);
-
-	sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
-			"%i service%s (%i failed) for host '%s'.",
-			state->svc_updated, state->svc_updated == 1 ? "" : "s",
-			state->svc_failed, state->current_host);
-	state->svc_updated = state->svc_failed = 0;
-
-	free(state->current_host);
-	state->current_host = strdup(hostname);
-	state->current_timestamp = last_update;
 	return 0;
 } /* sdb_collectd_get_data */
 
@@ -202,6 +192,11 @@ sdb_collectd_init(sdb_object_t *user_data)
 static int
 sdb_collectd_shutdown(__attribute__((unused)) sdb_object_t *user_data)
 {
+	if (! user_data)
+		return -1;
+
+	sdb_unixsock_client_destroy(SDB_OBJ_WRAPPER(user_data)->data);
+	SDB_OBJ_WRAPPER(user_data)->data = NULL;
 	return 0;
 } /* sdb_collectd_shutdown */
 
@@ -276,11 +271,11 @@ sdb_collectd_collect(sdb_object_t *user_data)
 	}
 
 	if (state.current_host) {
-		sdb_collectd_add_host(state.current_host, state.current_timestamp);
 		sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
 				"%i service%s (%i failed) for host '%s'.",
 				state.svc_updated, state.svc_updated == 1 ? "" : "s",
 				state.svc_failed, state.current_host);
+		free(state.current_host);
 	}
 	return 0;
 } /* sdb_collectd_collect */
@@ -358,6 +353,9 @@ sdb_collectd_config(oconfig_item_t *ci)
 {
 	int i;
 
+	if (! ci) /* nothing to do to deconfigure this plugin */
+		return 0;
+
 	for (i = 0; i < ci->children_num; ++i) {
 		oconfig_item_t *child = ci->children + i;