![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 125009cd574b355625960a53f4eeb995ad7575dc..49aaeb259eb3f0a3b74841e3b88617e9a153a47a 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
return HOST(sdb_llist_search_by_name(host_list, name));
} /* lookup_host */
-/* The host_lock has to be acquired before calling this function. */
static int
-store_obj(const char *hostname, int type, const char *name,
- sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+record_backend(sdb_store_obj_t *obj)
{
- char *host_cname = NULL, *cname = NULL;
- char **tmp;
-
- sdb_llist_t *parent_list;
- sdb_store_obj_t *old, *new;
const sdb_plugin_info_t *info;
-
- int status = 0;
+ char **tmp;
size_t i;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- assert((type == 0)
- || (type == SDB_HOST)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
+ info = sdb_plugin_current();
+ if (! info)
+ return 0;
- assert(hostname || (type == SDB_HOST));
- assert((! hostname)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
+ for (i = 0; i < obj->backends_num; ++i)
+ if (!strcasecmp(obj->backends[i], info->plugin_name))
+ return 0;
- if (! host_list)
- if (! (host_list = sdb_llist_create()))
- return -1;
- parent_list = host_list;
+ tmp = realloc(obj->backends,
+ (obj->backends_num + 1) * sizeof(*obj->backends));
+ if (! tmp)
+ return -1;
- if (type == SDB_HOST) {
- cname = sdb_plugin_cname(strdup(name));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
- }
- name = cname;
- }
+ obj->backends = tmp;
+ obj->backends[obj->backends_num] = strdup(info->plugin_name);
+ if (! obj->backends[obj->backends_num])
+ return -1;
- if (hostname) {
- sdb_host_t *host;
+ ++obj->backends_num;
+ return 0;
+} /* record_backend */
- host_cname = sdb_plugin_cname(strdup(hostname));
- if (! host_cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- free(cname);
- return -1;
- }
- hostname = host_cname;
-
- host = lookup_host(hostname);
- if (! host) {
- sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
- "host '%s' not found", SDB_STORE_TYPE_TO_NAME(type),
- name, hostname);
- free(host_cname);
- free(cname);
- return -1;
- }
+static int
+store_obj(sdb_llist_t *parent_list, int type, const char *name,
+ sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+{
+ sdb_store_obj_t *old, *new;
+ int status = 0;
- if (type == SDB_ATTRIBUTE)
- parent_list = host->attributes;
- else
- parent_list = host->services;
- }
+ assert(parent_list);
- if (type == SDB_HOST)
- old = STORE_OBJ(sdb_llist_search_by_name(host_list, name));
- else
- old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
+ if (last_update <= 0)
+ last_update = sdb_gettime();
+ old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
if (old) {
if (old->last_update > last_update) {
sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
* backends */
status = 1;
}
+ else if (old->last_update == last_update) {
+ /* don't report an error and also don't even log this to avoid
+ * excessive noise on high sampling frequencies */
+ status = 1;
+ }
else {
sdb_time_t interval = last_update - old->last_update;
old->last_update = last_update;
}
}
- free(host_cname);
- free(cname);
-
if (status < 0)
return status;
assert(new);
if (updated_obj)
*updated_obj = new;
- info = sdb_plugin_current();
- if (! info)
+ if (record_backend(new))
+ return -1;
+ return status;
+} /* store_obj */
+
+static int
+store_attr(sdb_llist_t *attributes, const char *key, const sdb_data_t *value,
+ sdb_time_t last_update)
+{
+ sdb_store_obj_t *attr = NULL;
+ int status;
+
+ status = store_obj(attributes, SDB_ATTRIBUTE, key, last_update, &attr);
+ if (status)
return status;
- for (i = 0; i < new->backends_num; ++i)
- if (!strcasecmp(new->backends[i], info->plugin_name))
- return status;
+ /* don't update unchanged values */
+ if (! sdb_data_cmp(&ATTR(attr)->value, value))
+ return status;
- tmp = realloc(new->backends,
- (new->backends_num + 1) * sizeof(*new->backends));
- if (! tmp)
+ assert(attr);
+ if (sdb_data_copy(&ATTR(attr)->value, value))
return -1;
+ return status;
+} /* store_attr */
- new->backends = tmp;
- new->backends[new->backends_num] = strdup(info->plugin_name);
- if (! new->backends[new->backends_num])
- return -1;
+/* The host_lock has to be acquired before calling this function. */
+static sdb_llist_t *
+get_host_children(const char *hostname, int type)
+{
+ char *cname = NULL;
+ sdb_host_t *host;
- ++new->backends_num;
- return status;
-} /* store_obj */
+ assert(hostname);
+ assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+
+ if (! host_list)
+ return NULL;
+
+ cname = sdb_plugin_cname(strdup(hostname));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return NULL;
+ }
+
+ host = lookup_host(cname);
+ free(cname);
+ if (! host)
+ return NULL;
+
+ if (type == SDB_ATTRIBUTE)
+ return host->attributes;
+ else
+ return host->services;
+} /* get_host_children */
/*
* store_common_tojson serializes common object attributes to JSON.
{
char time_str[64];
char interval_str[64];
+ size_t i;
if (! sdb_strftime(time_str, sizeof(time_str),
"%F %T %z", obj->last_update))
interval_str[sizeof(interval_str) - 1] = '\0';
sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"", time_str, interval_str);
+ "\"update_interval\": \"%s\", \"backends\": [",
+ time_str, interval_str);
+
+ for (i = 0; i < obj->backends_num; ++i) {
+ sdb_strbuf_append(buf, "\"%s\"", obj->backends[i]);
+ if (i < obj->backends_num - 1)
+ sdb_strbuf_append(buf, ",");
+ }
+ sdb_strbuf_append(buf, "]");
} /* store_common_tojson */
/*
* of the serialized data.
*/
static void
-store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
+store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf, int flags)
{
sdb_llist_iter_t *iter;
SDB_DOUBLE_QUOTED);
sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
}
-
store_common_tojson(sobj, buf);
+
+ if ((sobj->type == SDB_SERVICE)
+ && (! (flags & SDB_SKIP_ATTRIBUTES))) {
+ sdb_strbuf_append(buf, ", \"attributes\": ");
+ store_obj_tojson(SVC(sobj)->attributes, SDB_ATTRIBUTE,
+ buf, flags);
+ }
sdb_strbuf_append(buf, "}");
if (sdb_llist_iter_has_next(iter))
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
- int status;
+ char *cname = NULL;
+ int status = 0;
if (! name)
return -1;
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
+
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(/* hostname = */ NULL,
- /* stored object = */ SDB_HOST, name, last_update,
- /* updated_obj = */ NULL);
+ if (! host_list)
+ if (! (host_list = sdb_llist_create()))
+ status = -1;
+
+ if (! status)
+ status = store_obj(host_list, SDB_HOST, cname, last_update, NULL);
pthread_rwlock_unlock(&host_lock);
+
+ free(cname);
return status;
} /* sdb_store_host */
const char *key, const sdb_data_t *value,
sdb_time_t last_update)
{
- int status;
-
- sdb_store_obj_t *updated_attr = NULL;
+ sdb_llist_t *attrs;
+ int status = 0;
if ((! hostname) || (! key))
return -1;
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(hostname,
- /* stored object = */ SDB_ATTRIBUTE, key, last_update,
- &updated_attr);
-
- if (status >= 0) {
- assert(updated_attr);
- sdb_data_free_datum(&ATTR(updated_attr)->value);
- if (sdb_data_copy(&ATTR(updated_attr)->value, value)) {
- sdb_object_deref(SDB_OBJ(updated_attr));
- status = -1;
- }
+ attrs = get_host_children(hostname, SDB_ATTRIBUTE);
+ if (! attrs) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+ "host '%s' not found", key, hostname);
+ status = -1;
}
+ if (! status)
+ status = store_attr(attrs, key, value, last_update);
+
pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_attribute */
sdb_store_service(const char *hostname, const char *name,
sdb_time_t last_update)
{
- int status;
+ sdb_llist_t *services;
+
+ int status = 0;
if ((! hostname) || (! name))
return -1;
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(hostname,
- /* stored object = */ SDB_SERVICE, name, last_update,
- /* updated obj = */ NULL);
+ services = get_host_children(hostname, SDB_SERVICE);
+ if (! services) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
+ "host '%s' not found", name, hostname);
+ status = -1;
+ }
+
+ if (! status)
+ status = store_obj(services, SDB_SERVICE, name, last_update, NULL);
pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_service */
+int
+sdb_store_service_attr(const char *hostname, const char *service,
+ const char *key, const sdb_data_t *value, sdb_time_t last_update)
+{
+ sdb_llist_t *services;
+ sdb_service_t *svc;
+ int status = 0;
+
+ if ((! hostname) || (! service) || (! key))
+ return -1;
+
+ pthread_rwlock_wrlock(&host_lock);
+ services = get_host_children(hostname, SDB_SERVICE);
+ if (! services) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
+ "for service '%s' - host '%ss' not found",
+ key, service, hostname);
+ pthread_rwlock_unlock(&host_lock);
+ return -1;
+ }
+
+ svc = SVC(sdb_llist_search_by_name(services, service));
+ if (! svc) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+ "service '%s/%s' not found", key, hostname, service);
+ status = -1;
+ }
+
+ if (! status)
+ status = store_attr(svc->attributes, key, value, last_update);
+
+ pthread_rwlock_unlock(&host_lock);
+ return status;
+} /* sdb_store_service_attr */
+
int
sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
{
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");
- store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
+ store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf, flags);
}
if (! (flags & SDB_SKIP_SERVICES)) {
sdb_strbuf_append(buf, ", \"services\": ");
- store_obj_tojson(host->services, SDB_SERVICE, buf);
+ store_obj_tojson(host->services, SDB_SERVICE, buf, flags);
}
sdb_strbuf_append(buf, "}");