src/Makefile: Install collection.fcgi to pkglibdir rather than bindir.

[collection4.git] / src / graph_instance.c

diff --git a/src/graph_instance.c b/src/graph_instance.c
index 86cec84..a834950 100644 (file)
--- a/src/graph_instance.c
+++ b/src/graph_instance.c
@@ -150,13 +150,20 @@ static int gl_instance_get_rrdargs_cb (graph_def_t *def, void *user_data) /* {{{
   rrd_args_t *args = data->args;
 
   size_t i;
+  int status;
 
   for (i = 0; i < inst->files_num; i++)
   {
     if (!def_matches (def, inst->files[i]))
       continue;
 
-    def_get_rrdargs (def, inst->files[i], args);
+    status = def_get_rrdargs (def, inst->files[i], args);
+    if (status != 0)
+    {
+      fprintf (stderr, "gl_instance_get_rrdargs_cb: def_get_rrdargs failed with status %i\n",
+          status);
+      fflush (stderr);
+    }
   }
 
   return (0);
@@ -567,6 +574,20 @@ int inst_to_json (const graph_instance_t *inst, /* {{{ */
   return (0);
 } /* }}} int inst_to_json */
 
+int inst_data_to_json (const graph_instance_t *inst, /* {{{ */
+    dp_time_t begin, dp_time_t end,
+    yajl_gen handler)
+{
+  size_t i;
+
+  yajl_gen_array_open (handler);
+  for (i = 0; i < inst->files_num; i++)
+    ident_data_to_json (inst->files[i], begin, end, handler);
+  yajl_gen_array_close (handler);
+
+  return (0);
+} /* }}} int inst_data_to_json */
+
 int inst_describe (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
     char *buffer, size_t buffer_size)
 {