MINOR: stats: replace STAT_FMT_CSV with STAT_FMT_HTML
We need to switch the default mode if we want to add new output formats
later. Let CSV be the default and HTML be an option.
diff --git a/include/proto/dumpstats.h b/include/proto/dumpstats.h
index e9b2f76..0674c32 100644
--- a/include/proto/dumpstats.h
+++ b/include/proto/dumpstats.h
@@ -27,7 +27,7 @@
#include <types/stream_interface.h>
/* Flags for applet.ctx.stats.flags */
-#define STAT_FMT_CSV 0x00000001 /* dump the stats in CSV format instead of HTML */
+#define STAT_FMT_HTML 0x00000001 /* dump the stats in HTML format */
#define STAT_HIDE_DOWN 0x00000008 /* hide 'down' servers in the stats page */
#define STAT_NO_REFRESH 0x00000010 /* do not automatically refresh the stats page */
#define STAT_ADMIN 0x00000020 /* indicate a stats admin level */
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 3a890f3..24de6d0 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -941,12 +941,10 @@
si->applet.ctx.stats.sid = atoi(args[4]);
}
- si->applet.ctx.stats.flags |= STAT_FMT_CSV;
si->conn->xprt_st = STAT_ST_INIT;
si->applet.st0 = STAT_CLI_O_STAT; // stats_dump_stat_to_buffer
}
else if (strcmp(args[1], "info") == 0) {
- si->applet.ctx.stats.flags |= STAT_FMT_CSV;
si->conn->xprt_st = STAT_ST_INIT;
si->applet.st0 = STAT_CLI_O_INFO; // stats_dump_info_to_buffer
}
@@ -1815,7 +1813,7 @@
if ((si->applet.ctx.stats.flags & STAT_BOUND) && !(si->applet.ctx.stats.type & (1 << STATS_TYPE_FE)))
return 0;
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) {
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
chunk_appendf(&trash,
/* name, queue */
"<tr class=\"frontend\">");
@@ -2020,7 +2018,7 @@
*/
static int stats_dump_li_stats(struct stream_interface *si, struct proxy *px, struct listener *l, int flags)
{
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) {
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
chunk_appendf(&trash, "<tr class=socket>");
if (px->cap & PR_CAP_BE && px->srv && (si->applet.ctx.stats.flags & STAT_ADMIN)) {
/* Column sub-heading for Enable or Disable server */
@@ -2152,7 +2150,7 @@
struct chunk src;
int i;
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) { /* HTML mode */
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
static char *srv_hlt_st[7] = {
"DOWN",
"DN %d/%d ↑",
@@ -2532,7 +2530,7 @@
if ((si->applet.ctx.stats.flags & STAT_BOUND) && !(si->applet.ctx.stats.type & (1 << STATS_TYPE_BE)))
return 0;
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) { /* HTML mode */
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
chunk_appendf(&trash, "<tr class=\"backend\">");
if (px->srv && (si->applet.ctx.stats.flags & STAT_ADMIN)) {
/* Column sub-heading for Enable or Disable server */
@@ -2894,7 +2892,7 @@
/* fall through */
case STAT_PX_ST_TH:
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) {
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_px_hdr(si, px, uri);
if (bi_putchk(rep, &trash) == -1)
return 0;
@@ -3006,7 +3004,7 @@
/* fall through */
case STAT_PX_ST_END:
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) {
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_px_end(si, px);
if (bi_putchk(rep, &trash) == -1)
return 0;
@@ -3346,10 +3344,10 @@
/* fall through */
case STAT_ST_HEAD:
- if (si->applet.ctx.stats.flags & STAT_FMT_CSV)
- stats_dump_csv_header();
- else
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML)
stats_dump_html_head(uri);
+ else
+ stats_dump_csv_header();
if (bi_putchk(rep, &trash) == -1)
return 0;
@@ -3358,7 +3356,7 @@
/* fall through */
case STAT_ST_INFO:
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) {
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_info(si, uri);
if (bi_putchk(rep, &trash) == -1)
return 0;
@@ -3390,7 +3388,7 @@
/* fall through */
case STAT_ST_END:
- if (!(si->applet.ctx.stats.flags & STAT_FMT_CSV)) {
+ if (si->applet.ctx.stats.flags & STAT_FMT_HTML) {
stats_dump_html_end();
if (bi_putchk(rep, &trash) == -1)
return 0;
diff --git a/src/proto_http.c b/src/proto_http.c
index 60b630d..d49ef05 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3022,7 +3022,7 @@
"Cache-Control: no-cache\r\n"
"Connection: close\r\n"
"Content-Type: %s\r\n",
- (si->applet.ctx.stats.flags & STAT_FMT_CSV) ? "text/plain" : "text/html");
+ (si->applet.ctx.stats.flags & STAT_FMT_HTML) ? "text/html" : "text/plain");
if (uri->refresh > 0 && !(si->applet.ctx.stats.flags & STAT_NO_REFRESH))
chunk_appendf(&trash, "Refresh: %d\r\n",
@@ -7651,6 +7651,7 @@
memset(&si->applet.ctx.stats, 0, sizeof(si->applet.ctx.stats));
si->applet.ctx.stats.st_code = STAT_STATUS_INIT;
+ si->applet.ctx.stats.flags |= STAT_FMT_HTML; /* assume HTML mode by default */
/* check URI size */
if (uri_auth->uri_len > msg->sl.rq.u_l)
@@ -7683,7 +7684,7 @@
h = uri + uri_auth->uri_len;
while (h <= uri + msg->sl.rq.u_l - 4) {
if (memcmp(h, ";csv", 4) == 0) {
- si->applet.ctx.stats.flags |= STAT_FMT_CSV;
+ si->applet.ctx.stats.flags &= ~STAT_FMT_HTML;
break;
}
h++;