summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 032c425)
raw | patch | inline | side by side (parent: 032c425)
author | Sebastian Harl <sh@tokkee.org> | |
Tue, 26 Jan 2016 22:32:33 +0000 (23:32 +0100) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Tue, 26 Jan 2016 22:32:33 +0000 (23:32 +0100) |
src/frontend/query.c | patch | blob | history |
diff --git a/src/frontend/query.c b/src/frontend/query.c
index 5e443298b6bd8293a0d5d0eace091e5a4124cec9..2e2832469e8d2fed9beb2a405faa513f05edd09c 100644 (file)
--- a/src/frontend/query.c
+++ b/src/frontend/query.c
@@ -248,7 +248,11 @@ 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) {
+ 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 +260,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)