Merge pull request #1568 from l2isbad/varnish_plugin

[netdata.git] / src / web_client.c

diff --git a/src/web_client.c b/src/web_client.c
index 5915ed6cc3d2c18c05b09460cb9a370a47832076..2765767f6738ce98db67642085d3115da1246937 100644 (file)
--- a/src/web_client.c
+++ b/src/web_client.c
@@ -776,7 +776,7 @@ int web_client_api_request_v1_charts(struct web_client *w, char *url)
 
 int web_client_api_request_v1_allmetrics(struct web_client *w, char *url)
 {
-    int format = 0;
+    int format = ALLMETRICS_SHELL;
 
     while(url) {
         char *value = mystrsep(&url, "?&");
@@ -787,10 +787,12 @@ int web_client_api_request_v1_allmetrics(struct web_client *w, char *url)
         if(!value || !*value) continue;
 
         if(!strcmp(name, "format")) {
-            if(!strcmp(value, RAWMETRICS_FORMAT_BASH))
-                format = RAWMETRICS_BASH;
-            else if(!strcmp(value, RAWMETRICS_FORMAT_PROMETHEUS))
-                format = RAWMETRICS_PROMETHEUS;
+            if(!strcmp(value, ALLMETRICS_FORMAT_SHELL))
+                format = ALLMETRICS_SHELL;
+            else if(!strcmp(value, ALLMETRICS_FORMAT_PROMETHEUS))
+                format = ALLMETRICS_PROMETHEUS;
+            else
+                format = 0;
         }
     }
 
@@ -798,18 +800,19 @@ int web_client_api_request_v1_allmetrics(struct web_client *w, char *url)
     buffer_no_cacheable(w->response.data);
 
     switch(format) {
-        //case RAWMETRICS_BASH:
-        //    rrd_stats_api_v1_charts_allmetrics_bash(w->response.data);
-        //    return 200;
+        case ALLMETRICS_SHELL:
+            w->response.data->contenttype = CT_TEXT_PLAIN;
+            rrd_stats_api_v1_charts_allmetrics_shell(w->response.data);
+            return 200;
 
-        case RAWMETRICS_PROMETHEUS:
+        case ALLMETRICS_PROMETHEUS:
             w->response.data->contenttype = CT_PROMETHEUS;
             rrd_stats_api_v1_charts_allmetrics_prometheus(w->response.data);
             return 200;
 
         default:
             w->response.data->contenttype = CT_TEXT_PLAIN;
-            buffer_strcat(w->response.data, "Which format? Only '" RAWMETRICS_FORMAT_PROMETHEUS "' is currently supported.");
+            buffer_strcat(w->response.data, "Which format? Only '" ALLMETRICS_FORMAT_SHELL "' and '" ALLMETRICS_FORMAT_PROMETHEUS "' is currently supported.");
             return 400;
     }
 }
@@ -2094,7 +2097,6 @@ void web_client_process(struct web_client *w) {
 
                     error("web request to exit received.");
                     netdata_cleanup_and_exit(0);
-                    netdata_exit = 1;
                 }
                 else if(hash == hash_debug && strcmp(tok, "debug") == 0) {
                     buffer_flush(w->response.data);