diff --git a/src/core/store.c b/src/core/store.c
index 6420190a319b532ed0db1b2248e4aafd6ee77784..6d9c971702b4e696ca14991eb2ea4f4e4716413c 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
else {
sdb_time_t interval = last_update - old->last_update;
old->last_update = last_update;
- if (old->interval)
- old->interval = (sdb_time_t)((0.9 * (double)old->interval)
- + (0.1 * interval));
- else
- old->interval = interval;
+ if (interval) {
+ if (old->interval)
+ old->interval = (sdb_time_t)((0.9 * (double)old->interval)
+ + (0.1 * (double)interval));
+ else
+ old->interval = interval;
+ }
}
if (updated_obj)
{
sdb_llist_iter_t *iter;
char time_str[64];
+ char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
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 (type == SDB_ATTRIBUTE) {
char tmp[sdb_data_strlen(&SDB_ATTR(sobj)->value) + 1];
sdb_data_format(&SDB_ATTR(sobj)->value, tmp, sizeof(tmp),
SDB_DOUBLE_QUOTED);
- sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\"}",
- tmp, time_str);
+ sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"}", tmp, time_str,
+ interval_str);
}
else
- sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"}", time_str, interval_str);
if (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
if (status >= 0) {
assert(updated_attr);
+ sdb_data_free_datum(&SDB_ATTR(updated_attr)->value);
if (sdb_data_copy(&SDB_ATTR(updated_attr)->value, value)) {
sdb_object_deref(SDB_OBJ(updated_attr));
status = -1;
{
sdb_store_obj_t *host;
char time_str[64];
+ char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
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\"",
- SDB_OBJ(host)->name, time_str);
+ "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
+ SDB_OBJ(host)->name, time_str, interval_str);
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");