From: Olivier Houchard Date: Wed, 5 Apr 2017 20:50:59 +0000 (+0200) Subject: MINOR: doc: document the -x flag X-Git-Tag: v1.8-dev2~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d33fc3a7f5882add601725e71163539eb1163847;p=thirdparty%2Fhaproxy.git MINOR: doc: document the -x flag --- diff --git a/doc/haproxy.1 b/doc/haproxy.1 index 0a1b2f5ef5..91f58a3b8c 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\ ] [{\-sf|\-st}\ pidlist...] +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...] .SH DESCRIPTION @@ -155,6 +155,12 @@ which receive this signal will terminate immediately, closing all active sessions. This option must be specified last, followed by any number of PIDs. Technically speaking, \fBSIGTTOU\fP and \fBSIGTERM\fP are sent. +.TP +\f8\-x \fP +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. + .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/doc/management.txt b/doc/management.txt index 1d34f84365..33682779ed 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -277,6 +277,11 @@ list of options is : -vv : display the version, build options, libraries versions and usable pollers. This output is systematically requested when filing a bug report. + -x : connect to the specified socket and try to retrieve any + listening sockets from the old process, and use them instead of trying to + bind new ones. This is useful to avoid missing any new connection when + reloading the configuration on Linux. + A safe way to start HAProxy from an init file consists in forcing the daemon mode, storing existing pids to a pid file and using this pid file to notify older processes to finish before leaving :