From 95635ddac8c29859d297e8ba33174e71efd5fc47 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Thu, 13 Jun 2019 11:51:09 +0200 Subject: [PATCH] MINOR: doc: add master-worker in the man page Add some information about the master-worker in the man page. Should be backported in every version since 1.8. --- doc/haproxy.1 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/haproxy.1 b/doc/haproxy.1 index 579135295..ffe789109 100644 --- a/doc/haproxy.1 +++ b/doc/haproxy.1 @@ -6,7 +6,7 @@ HAProxy \- fast and reliable http reverse proxy and load balancer .SH SYNOPSIS -haproxy \-f [\-L\ ] [\-n\ maxconn] [\-N\ maxconn] [\-C\ ] [\-v|\-vv] [\-d] [\-D] [\-q] [\-V] [\-c] [\-p\ ] [\-dk] [\-ds] [\-de] [\-dp] [\-db] [\-dM[]] [\-m\ ] [\-x ] [{\-sf|\-st}\ pidlist...] +haproxy \-f [\-L\ ] [\-n\ maxconn] [\-N\ maxconn] [\-C\ ] [\-v|\-vv] [\-d] [\-D] [\-W] [\-Ws] [\-q] [\-V] [\-c] [\-p\ ] [\-dk] [\-ds] [\-de] [\-dp] [\-db] [\-dM[]] [\-m\ ] [\-x ] [{\-sf|\-st}\ pidlist...] .SH DESCRIPTION @@ -77,6 +77,16 @@ starting up. \fB\-D\fP Start in daemon mode. +.TP +\fB\-W\fP +Start in master-worker mode. Could be used either with foreground or daemon +mode. + +.TP +\fB\-Ws\fP +Start in master-worker mode with systemd notify support. It tells systemd when +the process is ready. This mode forces foreground. + .TP \fB\-q\fP Disable messages on output. @@ -177,6 +187,9 @@ Some signals have a special meaning for the haproxy daemon. Generally, they are \- \fBSIGUSR1\fP Tells the daemon to stop all proxies and exit once all sessions are closed. It is often referred to as the "soft-stop" signal. .TP +\- \fBSIGUSR2\fP +In master-worker mode, reloads the configuration and sends a soft-stop signal to old processes. +.TP \- \fBSIGTTOU\fP Tells the daemon to stop listening to all sockets. Used internally by \fB\-sf\fP and \fB\-st\fP. .TP