index 5506b0a939e984254f2c8646a7ba954a130dbc77..23d261bacf46baf7b3939f5718fe529c714f98d7 100644 (file)
#include "liboconfig/utils.h"
-#include <dbi/dbi.h>
-
#include <assert.h>
#include <errno.h>
return 0;
} /* sdb_puppet_stcfg_init */
+static int
+sdb_puppet_stcfg_shutdown(sdb_object_t *user_data)
+{
+ if (! user_data)
+ return -1;
+
+ sdb_dbi_client_destroy(SDB_OBJ_WRAPPER(user_data)->data);
+ SDB_OBJ_WRAPPER(user_data)->data = NULL;
+ return 0;
+} /* sdb_puppet_stcfg_shutdown */
+
static int
sdb_puppet_stcfg_collect(sdb_object_t *user_data)
{
sdb_puppet_stcfg_config_conn(oconfig_item_t *ci)
{
char *name = NULL;
- char cb_name[1024];
sdb_object_t *user_data;
sdb_dbi_client_t *client;
return -1;
}
- snprintf(cb_name, sizeof(cb_name), "puppet::storeconfigs::%s", name);
- cb_name[sizeof(cb_name) - 1] = '\0';
-
client = sdb_dbi_client_create(driver, database);
if (! client) {
char errbuf[1024];
return -1;
}
- sdb_plugin_register_init(cb_name, sdb_puppet_stcfg_init, user_data);
- sdb_plugin_register_collector(cb_name, sdb_puppet_stcfg_collect,
+ sdb_plugin_register_init(name, sdb_puppet_stcfg_init, user_data);
+ sdb_plugin_register_shutdown(name, sdb_puppet_stcfg_shutdown,
+ user_data);
+ sdb_plugin_register_collector(name, sdb_puppet_stcfg_collect,
/* interval */ NULL, user_data);
/* pass control to the list */
sdb_plugin_set_info(info, SDB_PLUGIN_INFO_VERSION, SDB_VERSION);
sdb_plugin_set_info(info, SDB_PLUGIN_INFO_PLUGIN_VERSION, SDB_VERSION);
- /* don't reinitialize dbi when reinitializing the plugin */
- if (info && (dbi_initialize(/* driver dir = */ NULL) < 0)) {
- sdb_log(SDB_LOG_ERR, "puppet::store-configs backend: failed to "
- "initialize DBI; possibly you don't have any drivers "
- "installed.");
- return -1;
- }
-
- sdb_plugin_register_config("puppet::store-configs",
- sdb_puppet_stcfg_config);
+ sdb_plugin_register_config(sdb_puppet_stcfg_config);
return 0;
} /* sdb_version_extra */