X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fmain.c;h=d0e87c1321a50c7cf6d38da1dc440feadc05ec66;hp=7bc024a8a12a0db056ad90c22d62ae8a37484db8;hb=1091c65227a740830654605f0360a0381171301c;hpb=a164d755a41a47cff81a643dfdd088c6a8de76a5

diff --git a/src/main.c b/src/main.c
index 7bc024a..d0e87c1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,7 +37,10 @@
 #include "utils_cgi.h"
 
 #include "action_graph.h"
+#include "action_instance_data_json.h"
+#include "action_graph_def_json.h"
 #include "action_list_graphs.h"
+#include "action_list_graphs_json.h"
 #include "action_list_hosts.h"
 #include "action_search.h"
 #include "action_search_json.h"
@@ -62,7 +65,10 @@ static int action_usage (void);
 static const action_t actions[] =
 {
   { "graph",       action_graph },
+  { "instance_data_json", action_instance_data_json },
+  { "graph_def_json", action_graph_def_json },
   { "list_graphs", action_list_graphs },
+  { "list_graphs_json", action_list_graphs_json },
   { "list_hosts",  action_list_hosts },
   { "search",      action_search },
   { "search_json", action_search_json },
@@ -102,19 +108,34 @@ static int handle_request (void) /* {{{ */
   action = param ("action");
   if (action == NULL)
   {
-    return (action_usage ());
+    return (action_list_graphs ());
   }
   else
   {
     size_t i;
+    int status = ENOENT;
+
+    gl_update (/* request_served = */ 0);
 
     for (i = 0; i < actions_num; i++)
     {
       if (strcmp (action, actions[i].name) == 0)
-        return ((*actions[i].callback) ());
+      {
+        status = (*actions[i].callback) ();
+        break;
+      }
     }
 
-    return (action_usage ());
+    if (i >= actions_num)
+      status = action_usage ();
+
+    /* Call finish before updating the graph list, so clients don't wait for
+     * the update to finish. */
+    FCGI_Finish ();
+
+    gl_update (/* request_served = */ 1);
+
+    return (status);
   }
 } /* }}} int handle_request */