X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fbackend%2Fcollectd%2Funixsock.c;h=21e1f8b2bda204183b3414b2668fafedda8b0eb4;hp=c01b0f324b874ab2ac4ac2ec97a91fd5e254175e;hb=e48ff35c0684d772d4ba8bdc9f75dafcc0df6a36;hpb=d2dfea6b174f94b1d3a76d693d9736182e4a5f33 diff --git a/src/backend/collectd/unixsock.c b/src/backend/collectd/unixsock.c index c01b0f3..21e1f8b 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,7 +109,7 @@ 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, @@ -123,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_has_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 */ @@ -194,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 */ @@ -268,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 */ @@ -283,8 +286,6 @@ sdb_collectd_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; @@ -313,9 +314,6 @@ sdb_collectd_config_instance(oconfig_item_t *ci) return -1; } - snprintf(cb_name, sizeof(cb_name), "collectd::unixsock::%s", name); - cb_name[sizeof(cb_name) - 1] = '\0'; - client = sdb_unixsock_client_create(socket_path); if (! client) { char errbuf[1024]; @@ -334,10 +332,10 @@ sdb_collectd_config_instance(oconfig_item_t *ci) return -1; } - sdb_plugin_register_init(cb_name, sdb_collectd_init, user_data); - sdb_plugin_register_shutdown(cb_name, sdb_collectd_shutdown, user_data); + sdb_plugin_register_init(name, sdb_collectd_init, user_data); + sdb_plugin_register_shutdown(name, sdb_collectd_shutdown, user_data); - sdb_plugin_register_collector(cb_name, sdb_collectd_collect, + sdb_plugin_register_collector(name, sdb_collectd_collect, /* interval */ NULL, user_data); /* pass control to the list */ @@ -350,6 +348,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; @@ -375,7 +376,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("collectd::unixsock", sdb_collectd_config); + sdb_plugin_register_config(sdb_collectd_config); return 0; } /* sdb_version_extra */