From 63329e36ab8630ed507ada2d27b33d08a06bd731 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Thu, 13 Jun 2019 17:03:37 +0200 Subject: [PATCH] MINOR: doc: update the manpage and usage message about -S Add -S in the manpage, and update the usage message. Should be backported to 1.9. --- doc/haproxy.1 | 6 ++++++ src/haproxy.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/haproxy.1 b/doc/haproxy.1 index f8749865fa..7554f9d9f8 100644 --- a/doc/haproxy.1 +++ b/doc/haproxy.1 @@ -173,6 +173,12 @@ Attempt to connect to the unix socket, and retrieve all the listening sockets from the old process. Those sockets will then be used if possible instead of binding new ones. +.TP +\fB\-S [,...]\fP +In master-worker mode, create a master CLI. This CLI will enable access to the +CLI of every worker. Useful for debugging, it's a convenient way of accessing a +leaving process. + .SH LOGGING Since HAProxy can run inside a chroot, it cannot reliably access /dev/log. For this reason, it uses the UDP protocol to send its logs to the server, diff --git a/src/haproxy.c b/src/haproxy.c index 0c1d5a2636..9821765a45 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -527,7 +527,7 @@ static void usage(char *name) " -dV disables SSL verify on servers side\n" " -sf/-st [pid ]* finishes/terminates old pids.\n" " -x get listening sockets from a unix socket\n" - " -S [,...] new stats socket for the master\n" + " -S [,...] new master CLI\n" "\n", name, cfg_maxpconn); exit(1);