X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fbackend%2Fmk-livestatus.c;h=0f94ce34fd2ebe2fc550d872ad595bc69028093b;hp=21c603ad497fab30db9189405ba807b874001f06;hb=8b3452e508a38e9a28aa82a4636a3dbe03d32e65;hpb=fffcdc97635e9fb40342c6ad55904cdc0b1ef101

diff --git a/src/backend/mk-livestatus.c b/src/backend/mk-livestatus.c
index 21c603a..0f94ce3 100644
--- a/src/backend/mk-livestatus.c
+++ b/src/backend/mk-livestatus.c
@@ -79,7 +79,7 @@ sdb_livestatus_get_host(sdb_unixsock_client_t __attribute__((unused)) *client,
 		return 0;
 
 	sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
-			"host '%s' (last update timestamp = %"PRIscTIME").",
+			"host '%s' (last update timestamp = %"PRIsdbTIME").",
 			hostname, timestamp);
 	return 0;
 } /* sdb_livestatus_get_host */
@@ -115,7 +115,7 @@ sdb_livestatus_get_svc(sdb_unixsock_client_t __attribute__((unused)) *client,
 		return 0;
 
 	sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
-			"service '%s / %s' (last update timestamp = %"PRIscTIME").",
+			"service '%s / %s' (last update timestamp = %"PRIsdbTIME").",
 			hostname, svcname, timestamp);
 	return 0;
 } /* sdb_livestatus_get_svc */
@@ -146,6 +146,17 @@ sdb_livestatus_init(sdb_object_t *user_data)
 	return 0;
 } /* sdb_livestatus_init */
 
+static int
+sdb_livestatus_shutdown(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_livestatus_shutdown */
+
 static int
 sdb_livestatus_collect(sdb_object_t *user_data)
 {
@@ -227,8 +238,6 @@ sdb_livestatus_config_instance(oconfig_item_t *ci)
 	char *name = NULL;
 	char *socket_path = NULL;
 
-	char cb_name[1024];
-
 	sdb_object_t *user_data;
 	sdb_unixsock_client_t *client;
 
@@ -257,9 +266,6 @@ sdb_livestatus_config_instance(oconfig_item_t *ci)
 		return -1;
 	}
 
-	snprintf(cb_name, sizeof(cb_name), "mk-livestatus::%s", name);
-	cb_name[sizeof(cb_name) - 1] = '\0';
-
 	client = sdb_unixsock_client_create(socket_path);
 	if (! client) {
 		char errbuf[1024];
@@ -278,8 +284,9 @@ sdb_livestatus_config_instance(oconfig_item_t *ci)
 		return -1;
 	}
 
-	sdb_plugin_register_init(cb_name, sdb_livestatus_init, user_data);
-	sdb_plugin_register_collector(cb_name, sdb_livestatus_collect,
+	sdb_plugin_register_init(name, sdb_livestatus_init, user_data);
+	sdb_plugin_register_shutdown(name, sdb_livestatus_shutdown, user_data);
+	sdb_plugin_register_collector(name, sdb_livestatus_collect,
 			/* interval */ NULL, user_data);
 
 	/* pass control to the list */
@@ -310,7 +317,6 @@ sdb_livestatus_config(oconfig_item_t *ci)
 int
 sdb_module_init(sdb_plugin_info_t *info)
 {
-	sdb_plugin_set_info(info, SDB_PLUGIN_INFO_NAME, "MK-Livestatus");
 	sdb_plugin_set_info(info, SDB_PLUGIN_INFO_DESC,
 			"backend accessing Nagios/Icinga/Shinken using MK Livestatus");
 	sdb_plugin_set_info(info, SDB_PLUGIN_INFO_COPYRIGHT,
@@ -319,7 +325,7 @@ sdb_module_init(sdb_plugin_info_t *info)
 	sdb_plugin_set_info(info, SDB_PLUGIN_INFO_VERSION, SDB_VERSION);
 	sdb_plugin_set_info(info, SDB_PLUGIN_INFO_PLUGIN_VERSION, SDB_VERSION);
 
-	sdb_plugin_register_config("mk-livestatus", sdb_livestatus_config);
+	sdb_plugin_register_config(sdb_livestatus_config);
 	return 0;
 } /* sdb_version_extra */