From b0ce3ad9ff84d909a82c604a5f4d3d656027bfb7 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 9 Oct 2019 11:19:29 +0200 Subject: [PATCH] MINOR: stats: make stats_dump_fields_json() directly take flags It used to take an inverted flag for STAT_STARTED, let's make it take the raw flags instead. --- src/stats.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/stats.c b/src/stats.c index d464bd582..719711264 100644 --- a/src/stats.c +++ b/src/stats.c @@ -603,12 +603,12 @@ err: /* Dump all fields from into using a typed "field:desc:type:value" format */ static int stats_dump_fields_json(struct buffer *out, const struct field *stats, - int first_stat) + unsigned int flags) { int field; int started = 0; - if (!first_stat && !chunk_strcat(out, ",")) + if ((flags & STAT_STARTED) && !chunk_strcat(out, ",")) return 0; if (!chunk_strcat(out, "[")) return 0; @@ -663,8 +663,8 @@ static int stats_dump_fields_json(struct buffer *out, err: chunk_reset(out); - if (!first_stat) - chunk_strcat(out, ","); + if (flags & STAT_STARTED) + chunk_strcat(out, ","); chunk_appendf(out, "{\"errorStr\":\"output buffer too short\"}"); return 0; } @@ -1362,9 +1362,7 @@ int stats_dump_one_line(const struct field *stats, unsigned int flags, struct pr else if (appctx->ctx.stats.flags & STAT_FMT_TYPED) ret = stats_dump_fields_typed(&trash, stats); else if (appctx->ctx.stats.flags & STAT_FMT_JSON) - ret = stats_dump_fields_json(&trash, stats, - !(appctx->ctx.stats.flags & - STAT_STARTED)); + ret = stats_dump_fields_json(&trash, stats, appctx->ctx.stats.flags); else ret = stats_dump_fields_csv(&trash, stats);