X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fquery.c;h=5d00636dd99e77219303c645bdf019f8ac59bfeb;hp=4ae4f64a5e0a1373f5ff6ddfb416c277aa546f36;hb=1bde17786b9a0b342daae5faa46a54b3eeab6558;hpb=25bba5d07cafb9f1169d687bffb742dae6f77a8e

diff --git a/src/frontend/query.c b/src/frontend/query.c
index 4ae4f64..5d00636 100644
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -51,6 +51,7 @@
 typedef struct {
 	char *type;
 	char *id;
+	sdb_time_t last_update;
 } metric_store_t;
 
 static int
@@ -70,6 +71,7 @@ metric_fetcher_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 
 	st->type = strdup(metric->store.type);
 	st->id = strdup(metric->store.id);
+	st->last_update = metric->store.last_update;
 	if ((! st->type) || (! st->id))
 		return -1;
 	return 0;
@@ -156,6 +158,7 @@ exec_store(sdb_ast_store_t *st, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 		snprintf(name, sizeof(name), "%s.%s", st->hostname, st->name);
 		metric_store.type = st->store_type;
 		metric_store.id = st->store_id;
+		metric_store.last_update = st->last_update;
 		status = sdb_plugin_store_metric(st->hostname, st->name,
 				&metric_store, st->last_update);
 		break;
@@ -222,7 +225,7 @@ exec_store(sdb_ast_store_t *st, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 static int
 exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
 {
-	metric_store_t st = { NULL, NULL };
+	metric_store_t st = { NULL, NULL, 0 };
 	sdb_object_wrapper_t obj = SDB_OBJECT_WRAPPER_STATIC(&st);
 	sdb_ast_fetch_t fetch = SDB_AST_FETCH_INIT;
 	sdb_timeseries_opts_t opts = { 0, 0 };
@@ -248,7 +251,13 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
 	}
 	if (status >= 0) {
 		series = sdb_plugin_fetch_timeseries(st.type, st.id, &opts);
-		if (! series) {
+		if (series) {
+			uint32_t res_type = htonl(SDB_CONNECTION_TIMESERIES);
+			sdb_strbuf_memcpy(buf, &res_type, sizeof(res_type));
+			sdb_timeseries_tojson(series, buf);
+			sdb_timeseries_destroy(series);
+		}
+		else {
 			sdb_log(SDB_LOG_ERR, "frontend: Failed to fetch time-series '%s/%s' "
 					"- %s fetcher callback returned no data for '%s'",
 					ts->hostname, ts->metric, st.type, st.id);
@@ -256,11 +265,6 @@ exec_timeseries(sdb_ast_timeseries_t *ts, sdb_strbuf_t *buf, sdb_strbuf_t *errbu
 		}
 	}
 
-	if (status >= 0) {
-		sdb_timeseries_tojson(series, buf);
-		sdb_timeseries_destroy(series);
-	}
-
 	free(fetch.hostname);
 	free(fetch.name);
 	if (st.type)
@@ -477,7 +481,7 @@ sdb_conn_lookup(sdb_conn_t *conn)
 int
 sdb_conn_store(sdb_conn_t *conn)
 {
-	sdb_ast_node_t *ast;
+	sdb_ast_node_t *ast = NULL;
 	const char *buf = sdb_strbuf_string(conn->buf);
 	size_t len = conn->cmd_len;
 	uint32_t type;