Replace mater remnants with main in nghttpx manual

This commit is contained in:
Tatsuhiro Tsujikawa 2021-07-18 14:02:52 +09:00
parent deb68b414a
commit 1b6f547948
1 changed files with 15 additions and 15 deletions

View File

@ -46,14 +46,14 @@ Error log
using :option:`--errorlog-file`. The format of log message is as using :option:`--errorlog-file`. The format of log message is as
follows: follows:
<datetime> <master-pid> <current-pid> <thread-id> <level> (<filename>:<line>) <msg> <datetime> <main-pid> <current-pid> <thread-id> <level> (<filename>:<line>) <msg>
<datetime> <datetime>
It is a combination of date and time when the log is written. It It is a combination of date and time when the log is written. It
is in ISO 8601 format. is in ISO 8601 format.
<master-pid> <main-pid>
It is a master process ID. It is a main process ID.
<current-pid> <current-pid>
It is a process ID which writes this log. It is a process ID which writes this log.
@ -86,30 +86,30 @@ SIGUSR2
Fork and execute nghttpx. It will execute the binary in the same Fork and execute nghttpx. It will execute the binary in the same
path with same command-line arguments and environment variables. As path with same command-line arguments and environment variables. As
of nghttpx version 1.20.0, the new master process sends SIGQUIT to of nghttpx version 1.20.0, the new main process sends SIGQUIT to the
the original master process when it is ready to serve requests. For original main process when it is ready to serve requests. For the
the earlier versions of nghttpx, user has to send SIGQUIT to the earlier versions of nghttpx, user has to send SIGQUIT to the
original master process. original main process.
The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former The difference between SIGUSR2 (+ SIGQUIT) and SIGHUP is that former
is usually used to execute new binary, and the master process is is usually used to execute new binary, and the main process is newly
newly spawned. On the other hand, the latter just reloads spawned. On the other hand, the latter just reloads configuration
configuration file, and the same master process continues to exist. file, and the same main process continues to exist.
.. note:: .. note::
nghttpx consists of multiple processes: one process for processing nghttpx consists of multiple processes: one process for processing
these signals, and another one for processing requests. The former these signals, and another one for processing requests. The former
spawns the latter. The former is called master process, and the spawns the latter. The former is called main process, and the
latter is called worker process. If neverbleed is enabled, the latter is called worker process. If neverbleed is enabled, the
worker process spawns neverbleed daemon process which does RSA key worker process spawns neverbleed daemon process which does RSA key
processing. The above signal must be sent to the master process. processing. The above signal must be sent to the main process. If
If the other processes received one of them, it is ignored. This the other processes received one of them, it is ignored. This
behaviour of these processes may change in the future release. In behaviour of these processes may change in the future release. In
other words, in the future release, the processes other than master other words, in the future release, the processes other than main
process may terminate upon the reception of these signals. process may terminate upon the reception of these signals.
Therefore these signals should not be sent to the processes other Therefore these signals should not be sent to the processes other
than master process. than main process.
SERVER PUSH SERVER PUSH
----------- -----------