From 02c2cc8cbec61287af9af54b7b712fdb5f9747ca Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Tue, 14 Dec 2021 15:22:29 +0100 Subject: [PATCH] MINOR: cli: "show version" displays the current process version This patch implements a simple "show version" command which returns the version of the current process. It's available from the master and the worker processes, so it is easy to check if the master and the workers have the same version. This is a minor patch that really improve compatibility checks for scripts. Could be backported in haproxy version as far as 2.0. (cherry picked from commit 740629e2966641871b183d1c728fa7aeda45a1cc) Signed-off-by: William Lallemand --- doc/management.txt | 11 +++++++++++ src/cli.c | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/doc/management.txt b/doc/management.txt index 146ae2e..ceb9cb2 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -3356,6 +3356,17 @@ show trace [] "-" otherwise. All these events are independent and an event might trigger a start without being reported and conversely. +show version + Show the version of the current HAProxy process. This is available from + master and workers CLI. + Example: + + $ echo "show version" | socat /var/run/haproxy.sock stdio + 2.4.9 + + $ echo "show version" | socat /var/run/haproxy-master.sock stdio + 2.5.0 + shutdown frontend Completely delete the specified frontend. All the ports it was bound to will be released. It will not be possible to enable the frontend anymore after diff --git a/src/cli.c b/src/cli.c index 7ad42d5..a4c0ef3 100644 --- a/src/cli.c +++ b/src/cli.c @@ -1756,6 +1756,14 @@ static int cli_parse_expert_experimental_mode(char **args, char *payload, struct return 1; } +/* shows HAProxy version */ +static int cli_parse_show_version(char **args, char *payload, struct appctx *appctx, void *private) +{ + char *msg = NULL; + + return cli_dynmsg(appctx, LOG_INFO, memprintf(&msg, "%s\n", haproxy_version)); +} + int cli_parse_default(char **args, char *payload, struct appctx *appctx, void *private) { return 0; @@ -2972,6 +2980,7 @@ static struct cli_kw_list cli_kws = {{ },{ { { "show", "cli", "level", NULL }, "show cli level : display the level of the current CLI session", cli_parse_show_lvl, NULL, NULL, NULL, ACCESS_MASTER}, { { "show", "fd", NULL }, "show fd [num] : dump list of file descriptors in use or a specific one", cli_parse_show_fd, cli_io_handler_show_fd, NULL }, { { "show", "activity", NULL }, "show activity : show per-thread activity stats (for support/developers)", cli_parse_default, cli_io_handler_show_activity, NULL }, + { { "show", "version", NULL }, "show version : show version of the current process", cli_parse_show_version, NULL, NULL, NULL, ACCESS_MASTER }, { { "operator", NULL }, "operator : lower the level of the current CLI session to operator", cli_parse_set_lvl, NULL, NULL, NULL, ACCESS_MASTER}, { { "user", NULL }, "user : lower the level of the current CLI session to user", cli_parse_set_lvl, NULL, NULL, NULL, ACCESS_MASTER}, {{},} -- 1.7.10.4