From c32f39431cdba2ca2f63b1debcfbfec2ee30f7d5 Mon Sep 17 00:00:00 2001 From: MIZUTA Takeshi Date: Wed, 26 Aug 2020 13:46:19 +0900 Subject: [PATCH] DOC: add description of pidfile in master-worker mode Previously, pidfile was only described for daemon mode. In the case of master-worker mode, the handling of pidfile is different from daemon mode, so the description has been added. --- doc/configuration.txt | 7 ++++--- doc/haproxy.1 | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index ca2880673..83fb85a56 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -1199,9 +1199,10 @@ nbthread value is reported in the output of "haproxy -vv". See also "nbproc". pidfile - Writes PIDs of all daemons into file . This option is equivalent to - the "-p" command line argument. The file must be accessible to the user - starting the process. See also "daemon". + Writes PIDs of all daemons into file when daemon mode or writes PID + of master process into file when master-worker mode. This option is + equivalent to the "-p" command line argument. The file must be accessible to + the user starting the process. See also "daemon" and "master-worker". pp2-never-send-local A bug in the PROXY protocol v2 implementation was present in HAProxy up to diff --git a/doc/haproxy.1 b/doc/haproxy.1 index 7554f9d9f..4c2d78677 100644 --- a/doc/haproxy.1 +++ b/doc/haproxy.1 @@ -105,7 +105,8 @@ exits with code 1 if a syntax error was found. .TP \fB\-p \fP Ask the process to write down each of its children's pids to this file -in daemon mode. +in daemon mode or ask the process to write down its master's pid to +this file in master-worker mode. .TP \fB\-dk\fP