From 5789da3b729f5e3724aeecdcec1a44476659ed03 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 25 Jan 2021 14:16:35 +0100 Subject: json: limit: Always include burst value The default burst value is non-zero, so JSON output should include it. Signed-off-by: Phil Sutter --- src/json.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/json.c') diff --git a/src/json.c b/src/json.c index 585d3532..83717141 100644 --- a/src/json.c +++ b/src/json.c @@ -1168,19 +1168,17 @@ json_t *limit_stmt_json(const struct stmt *stmt, struct output_ctx *octx) burst_unit = get_rate(stmt->limit.burst, &burst); } - root = json_pack("{s:I, s:s}", + root = json_pack("{s:I, s:I, s:s}", "rate", rate, + "burst", burst, "per", get_unit(stmt->limit.unit)); if (inv) json_object_set_new(root, "inv", json_boolean(inv)); if (rate_unit) json_object_set_new(root, "rate_unit", json_string(rate_unit)); - if (burst && burst != 5) { - json_object_set_new(root, "burst", json_integer(burst)); - if (burst_unit) - json_object_set_new(root, "burst_unit", - json_string(burst_unit)); - } + if (burst_unit) + json_object_set_new(root, "burst_unit", + json_string(burst_unit)); return json_pack("{s:o}", "limit", root); } -- cgit v1.2.3