store: Don't change the interval if the new interval is zero.

[sysdb.git] / src / core / store.c

diff --git a/src/core/store.c b/src/core/store.c
index b2fb0f602837f62128e09c849b00dde84f1389c0..dace58f899f78ac27d681f22927ed088a7850170 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -67,6 +67,7 @@ store_base_init(sdb_object_t *obj, va_list ap)
        sobj->type = va_arg(ap, int);
 
        sobj->last_update = va_arg(ap, sdb_time_t);
+       sobj->interval = 0;
        sobj->parent = NULL;
        return 0;
 } /* store_base_init */
@@ -292,7 +293,15 @@ store_obj(int parent_type, const char *parent_name,
                        status = 1;
                }
                else {
+                       sdb_time_t interval = last_update - old->last_update;
                        old->last_update = last_update;
+                       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)
@@ -346,6 +355,7 @@ 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));
 
@@ -371,16 +381,23 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
                        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, ",");
@@ -496,6 +513,7 @@ sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
 {
        sdb_store_obj_t *host;
        char time_str[64];
+       char interval_str[64];
 
        if ((! h) || (h->type != SDB_HOST) || (! buf))
                return -1;
@@ -507,9 +525,14 @@ sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
                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\": ");