![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 1b8243b091d4149a98dabea39927b5eb661b122c..fc2a7f472d6dbdc0fb7111c2096cbfde38741d6f 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
sobj->last_update = va_arg(ap, sdb_time_t);
sobj->interval = 0;
+ sobj->backends = NULL;
+ sobj->backends_num = 0;
sobj->parent = NULL;
return 0;
} /* store_obj_init */
static void
store_obj_destroy(sdb_object_t *obj)
{
- const sdb_store_obj_t *sobj = STORE_CONST_OBJ(obj);
+ sdb_store_obj_t *sobj = STORE_OBJ(obj);
+ size_t i;
+
+ for (i = 0; i < sobj->backends_num; ++i)
+ free(sobj->backends[i]);
+ free(sobj->backends);
+ sobj->backends = NULL;
+ sobj->backends_num = 0;
if (sobj->parent)
sdb_object_deref(SDB_OBJ(sobj->parent));
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;
+ const sdb_plugin_info_t *info;
+ char **tmp;
+ size_t i;
- sdb_llist_t *parent_list;
- sdb_store_obj_t *old;
- int status = 0;
+ info = sdb_plugin_current();
+ if (! info)
+ return 0;
- if (last_update <= 0)
- last_update = sdb_gettime();
+ for (i = 0; i < obj->backends_num; ++i)
+ if (!strcasecmp(obj->backends[i], info->plugin_name))
+ return 0;
- assert((type == 0)
- || (type == SDB_HOST)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
-
- assert(hostname || (type == SDB_HOST));
- assert((! hostname)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
-
- if (! host_list)
- if (! (host_list = sdb_llist_create()))
- return -1;
- parent_list = host_list;
-
- if (type == SDB_HOST) {
- cname = sdb_plugin_cname(strdup(name));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
- }
- name = cname;
- }
+ tmp = realloc(obj->backends,
+ (obj->backends_num + 1) * sizeof(*obj->backends));
+ if (! tmp)
+ return -1;
- if (hostname) {
- sdb_host_t *host;
+ obj->backends = tmp;
+ obj->backends[obj->backends_num] = strdup(info->plugin_name);
+ if (! obj->backends[obj->backends_num])
+ return -1;
- 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;
- }
+ ++obj->backends_num;
+ return 0;
+} /* record_backend */
- if (type == SDB_ATTRIBUTE)
- parent_list = host->attributes;
- else
- parent_list = host->services;
- }
+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_HOST)
- old = STORE_OBJ(sdb_llist_search_by_name(host_list, name));
- else
- old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
+ assert(parent_list);
+ old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
if (old) {
- if (old->last_update > last_update) {
+ if (old->last_update >= last_update) {
sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
"value too old (%"PRIscTIME" < %"PRIscTIME")",
SDB_STORE_TYPE_TO_NAME(type), name,
}
}
- if (updated_obj)
- *updated_obj = old;
+ new = old;
}
else {
- sdb_store_obj_t *new;
-
if (type == SDB_ATTRIBUTE) {
/* the value will be updated by the caller */
new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
}
- if (! new) {
+ if (new) {
+ status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
+ sdb_object_cmp_by_name);
+
+ /* pass control to the list or destroy in case of an error */
+ sdb_object_deref(SDB_OBJ(new));
+ }
+ else {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
SDB_STORE_TYPE_TO_NAME(type), name,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- free(host_cname);
- free(cname);
- return -1;
+ status = -1;
}
+ }
+
+ if (status < 0)
+ return status;
+ assert(new);
+
+ if (updated_obj)
+ *updated_obj = new;
+
+ if (record_backend(new))
+ return -1;
+ return status;
+} /* store_obj */
+
+/* The host_lock has to be acquired before calling this function. */
+static int
+store_host_obj(const char *hostname, int type, const char *name,
+ sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+{
+ char *cname = NULL;
+ sdb_host_t *host;
+ sdb_llist_t *parent_list;
- status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
- sdb_object_cmp_by_name);
+ int status = 0;
- /* pass control to the list or destroy in case of an error */
- sdb_object_deref(SDB_OBJ(new));
+ if (last_update <= 0)
+ last_update = sdb_gettime();
+
+ assert(hostname);
+ assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+
+ if (! host_list)
+ return -1;
+
+ cname = sdb_plugin_cname(strdup(hostname));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
- if (updated_obj)
- *updated_obj = new;
+ host = lookup_host(cname);
+ 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(cname);
+ return -1;
}
- free(host_cname);
+
+ if (type == SDB_ATTRIBUTE)
+ parent_list = host->attributes;
+ else
+ parent_list = host->services;
+
+ status = store_obj(parent_list, type, name,
+ last_update, updated_obj);
+
free(cname);
return status;
-} /* store_obj */
+} /* store_host_obj */
+
+/*
+ * store_common_tojson serializes common object attributes to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf)
+{
+ 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))
+ snprintf(time_str, sizeof(time_str), "<error>");
+ time_str[sizeof(time_str) - 1] = '\0';
+
+ if (! sdb_strfinterval(interval_str, sizeof(interval_str),
+ obj->interval))
+ snprintf(interval_str, sizeof(interval_str), "<error>");
+ interval_str[sizeof(interval_str) - 1] = '\0';
+
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"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 */
/*
* store_obj_tojson serializes attribute / service objects to JSON.
store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
{
sdb_llist_iter_t *iter;
- char time_str[64];
- char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
sdb_strbuf_append(buf, "[");
-
iter = sdb_llist_get_iter(list);
if (! iter) {
char errbuf[1024];
assert(sobj);
assert(sobj->type == type);
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", sobj->last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
-
- if (! sdb_strfinterval(interval_str, sizeof(interval_str),
- sobj->interval))
- snprintf(interval_str, sizeof(interval_str), "<error>");
- interval_str[sizeof(interval_str) - 1] = '\0';
-
sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
if (sobj->type == SDB_ATTRIBUTE) {
char tmp[sdb_data_strlen(&ATTR(sobj)->value) + 1];
sdb_data_format(&ATTR(sobj)->value, tmp, sizeof(tmp),
SDB_DOUBLE_QUOTED);
- sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"}", tmp, time_str,
- interval_str);
+ sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
}
- else
- sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"}", time_str, interval_str);
+
+ store_common_tojson(sobj, buf);
+ sdb_strbuf_append(buf, "}");
if (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
- int status;
+ char *cname = NULL;
+ int status = 0;
if (! name)
return -1;
+ if (last_update <= 0)
+ last_update = sdb_gettime();
+
+ 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 */
return -1;
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(hostname,
- /* stored object = */ SDB_ATTRIBUTE, key, last_update,
+ status = store_host_obj(hostname, 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));
+ if (sdb_data_copy(&ATTR(updated_attr)->value, value))
status = -1;
- }
}
pthread_rwlock_unlock(&host_lock);
return -1;
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(hostname,
- /* stored object = */ SDB_SERVICE, name, last_update,
- /* updated obj = */ NULL);
+ status = store_host_obj(hostname, SDB_SERVICE, name, last_update, NULL);
pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_service */
sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
{
sdb_host_t *host;
- char time_str[64];
- char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
host = HOST(h);
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", host->_last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
-
- if (! sdb_strfinterval(interval_str, sizeof(interval_str),
- host->_interval))
- snprintf(interval_str, sizeof(interval_str), "<error>");
- interval_str[sizeof(interval_str) - 1] = '\0';
-
- sdb_strbuf_append(buf, "{\"name\": \"%s\", "
- "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
- SDB_OBJ(host)->name, time_str, interval_str);
+ sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
+ store_common_tojson(h, buf);
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");