index dea6794080ed9a284581de5b664f42d040c077a8..e631ae7525acee7c8426563ed51c8531f5825a0f 100644 (file)
* 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"
size_t n, sdb_data_t *data,
sdb_object_t __attribute__((unused)) *user_data)
{
- char *hostname = NULL;
- sdb_time_t timestamp = 0;
-
- sdb_host_t host = SDB_HOST_INIT;
+ const char *hostname;
+ sdb_time_t timestamp;
int status;
assert((data[0].type == SDB_TYPE_STRING)
&& (data[1].type == SDB_TYPE_DATETIME));
- hostname = strdup(data[0].data.string);
+ hostname = data[0].data.string;
timestamp = data[1].data.datetime;
- SDB_OBJ(&host)->name = hostname;
- host._last_update = timestamp;
-
- status = sdb_store_host(&host);
+ status = sdb_store_host(hostname, timestamp);
if (status < 0) {
sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
"store/update host '%s'.", hostname);
- free(hostname);
return -1;
}
else if (status > 0) /* value too old */
sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
"host '%s' (last update timestamp = %"PRIscTIME").",
hostname, timestamp);
- free(hostname);
return 0;
} /* sdb_livestatus_get_host */
size_t n, sdb_data_t *data,
sdb_object_t __attribute__((unused)) *user_data)
{
- char *hostname = NULL;
- char *svcname = NULL;
+ const char *hostname = NULL;
+ const char *svcname = NULL;
sdb_time_t timestamp = 0;
- sdb_service_t svc = SDB_SVC_INIT;
-
int status;
assert(n == 3);
&& (data[1].type == SDB_TYPE_STRING)
&& (data[2].type == SDB_TYPE_DATETIME));
- hostname = strdup(data[0].data.string);
- svcname = strdup(data[1].data.string);
+ hostname = data[0].data.string;
+ svcname = data[1].data.string;
timestamp = data[2].data.datetime;
- svc.hostname = hostname;
- SDB_OBJ(&svc)->name = svcname;
- svc._last_update = timestamp;
-
- status = sdb_store_service(&svc);
+ status = sdb_store_service(hostname, svcname, timestamp);
if (status < 0) {
sdb_log(SDB_LOG_ERR, "MK Livestatus backend: Failed to "
"store/update service '%s / %s'.", hostname, svcname);
- free(hostname);
- free(svcname);
return -1;
}
else if (status > 0) /* value too old */
sdb_log(SDB_LOG_DEBUG, "MK Livestatus backend: Added/updated "
"service '%s / %s' (last update timestamp = %"PRIscTIME").",
hostname, svcname, timestamp);
- free(hostname);
- free(svcname);
return 0;
} /* sdb_livestatus_get_svc */
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)
{
}
sdb_plugin_register_init(cb_name, sdb_livestatus_init, user_data);
+ sdb_plugin_register_shutdown(cb_name, sdb_livestatus_shutdown, user_data);
sdb_plugin_register_collector(cb_name, sdb_livestatus_collect,
/* interval */ NULL, user_data);
{
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;