index 945773983ee173c726049d32e22db59a06000d24..1ea0f0d2000816521eaab1ca43131f45af52e564 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"
static int
sdb_collectd_add_host(const char *hostname, sdb_time_t last_update)
{
- sdb_host_t host = SDB_HOST_INIT;
- char name[strlen(hostname) + 1];
-
int status;
- strncpy(name, hostname, sizeof(name));
-
- host._name = name;
- host._last_update = last_update;
-
- status = sdb_store_host(&host);
+ status = sdb_store_host(hostname, last_update);
if (status < 0) {
sdb_log(SDB_LOG_ERR, "collectd::unixsock backend: Failed to "
- "store/update host '%s'.", name);
+ "store/update host '%s'.", hostname);
return -1;
}
else if (status > 0) /* value too old */
sdb_log(SDB_LOG_DEBUG, "collectd::unixsock backend: Added/updated "
"host '%s' (last update timestamp = %"PRIscTIME").",
- name, last_update);
+ hostname, last_update);
return 0;
} /* sdb_collectd_add_host */
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;
- 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;
return -1;
}
- if (! sdb_store_get_host(hostname))
+ if (! sdb_store_has_host(hostname))
sdb_collectd_add_host(hostname, last_update);
if (sdb_collectd_add_svc(hostname, plugin, type, last_update))
return -1;
}
- user_data = sdb_object_create_wrapper(client,
+ user_data = sdb_object_create_wrapper("unixsock-client", client,
(void (*)(void *))sdb_unixsock_client_destroy);
if (! user_data) {
sdb_unixsock_client_destroy(client);