From: Willy Tarreau <w@1wt.eu>
Date: Fri, 30 Apr 2021 08:55:53 +0000 (+0200)
Subject: MINOR: map: show the current and next pattern version in "show map"
X-Git-Tag: v2.4-dev18~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3a42a6c2dd9f5c4f98b72b36a27cf14b88a3bfb;p=thirdparty%2Fhaproxy.git

MINOR: map: show the current and next pattern version in "show map"

The "show map" command wasn't updated when pattern generations were
added for atomic reloads, let's report them in the "show map" command
that lists all known maps. It will be useful for users.
---

diff --git a/src/map.c b/src/map.c
index 490f8bb69b..21dc545d95 100644
--- a/src/map.c
+++ b/src/map.c
@@ -437,9 +437,9 @@ static int cli_io_handler_pats_list(struct appctx *appctx)
 			/* Build messages. If the reference is used by another category than
 			 * the listed categories, display the information in the message.
 			 */
-			chunk_appendf(&trash, "%d (%s) %s\n", appctx->ctx.map.ref->unique_id,
+			chunk_appendf(&trash, "%d (%s) %s. curr_ver=%u next_ver=%u\n", appctx->ctx.map.ref->unique_id,
 			              appctx->ctx.map.ref->reference ? appctx->ctx.map.ref->reference : "",
-			              appctx->ctx.map.ref->display);
+			              appctx->ctx.map.ref->display, appctx->ctx.map.ref->curr_gen, appctx->ctx.map.ref->next_gen);
 
 			if (ci_putchk(si_ic(si), &trash) == -1) {
 				/* let's try again later from this stream. We add ourselves into