projects
/
collection4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/master'
[collection4.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
74d5d27
..
896a612
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-37,8
+37,12
@@
#include "utils_cgi.h"
#include "action_graph.h"
#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.h"
+#include "action_list_graphs_json.h"
#include "action_list_hosts.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"
#include "action_search.h"
#include "action_search_json.h"
#include "action_show_graph.h"
@@
-62,8
+66,12
@@
static int action_usage (void);
static const action_t actions[] =
{
{ "graph", action_graph },
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", action_list_graphs },
+ { "list_graphs_json", action_list_graphs_json },
{ "list_hosts", action_list_hosts },
{ "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 },
{ "search", action_search },
{ "search_json", action_search_json },
{ "show_graph", action_show_graph },
@@
-102,7
+110,7
@@
static int handle_request (void) /* {{{ */
action = param ("action");
if (action == NULL)
{
action = param ("action");
if (action == NULL)
{
- return (action_
usage
());
+ return (action_
list_graphs
());
}
else
{
}
else
{
@@
-114,12
+122,19
@@
static int handle_request (void) /* {{{ */
for (i = 0; i < actions_num; i++)
{
if (strcmp (action, actions[i].name) == 0)
for (i = 0; i < actions_num; i++)
{
if (strcmp (action, actions[i].name) == 0)
+ {
status = (*actions[i].callback) ();
status = (*actions[i].callback) ();
+ break;
+ }
}
if (i >= actions_num)
status = 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);
gl_update (/* request_served = */ 1);
return (status);