Merge remote-tracking branch 'github/master'

[collection4.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 0722403..896a612 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,9 @@
 #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_list_hosts_json.h"
 #include "action_search.h"
 #include "action_search_json.h"
 #include "action_show_graph.h"
@@ -67,7 +69,9 @@ static const action_t actions[] =
   { "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 },
+  { "list_hosts_json",  action_list_hosts_json },
   { "search",      action_search },
   { "search_json", action_search_json },
   { "show_graph",  action_show_graph },
@@ -127,8 +131,9 @@ static int handle_request (void) /* {{{ */
     if (i >= actions_num)
       status = action_usage ();
 
-    fflush (stdout);
-    fclose (stdout);
+    /* Call finish before updating the graph list, so clients don't wait for
+     * the update to finish. */
+    FCGI_Finish ();
 
     gl_update (/* request_served = */ 1);