From: Justin Erenkrantz Date: Thu, 20 Sep 2001 03:05:32 +0000 (+0000) Subject: Update doc for the SIGUSR1 change - we no longer use SIGWINCH except on X-Git-Tag: 2.0.26~212 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc7b052e5031c1d5bec75b757af167276635b8d7;p=thirdparty%2Fapache%2Fhttpd.git Update doc for the SIGUSR1 change - we no longer use SIGWINCH except on Linux 2.0/glibc 2.0 which doesn't allow SIGUSR1 to be used by programs. Feel free to change the wording. I don't care. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91091 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8 index a683eef29d2..87041d374cd 100644 --- a/docs/man/apachectl.8 +++ b/docs/man/apachectl.8 @@ -109,7 +109,7 @@ Displays a brief status report. Similar to the fullstatus option, except that the list of requests currently being served is omitted. .TP .BI graceful -Gracefully restarts the Apache daemon by sending it a SIGWINCH. If +Gracefully restarts the Apache daemon by sending it a SIGUSR1. If the daemon is not running, it is started. This differs from a normal restart in that currently open connections are not aborted. A side effect is that old log files will not be closed immediately. @@ -118,6 +118,9 @@ necessary to ensure that the old log files are closed before processing them. This command automatically checks the configuration files via .BI configtest before initiating the restart to make sure Apache doesn't die. +On certain platforms that do not allow SIGUSR1 to be used for a graceful +restart, an alternative signal may be used (such as SIGWINCH). graceful +will send the right signal for your platform. .TP .BI configtest Run a configuration file syntax test. It parses the configuration diff --git a/docs/manual/programs/apachectl.html b/docs/manual/programs/apachectl.html index 15f6b7433a3..c8db85807f3 100644 --- a/docs/manual/programs/apachectl.html +++ b/docs/manual/programs/apachectl.html @@ -57,7 +57,7 @@ vlink="#000080" alink="#ff0000"> requests currently being served is omitted. graceful Gracefully restarts the Apache daemon by sending - it a SIGWINCH. If the daemon is not running, it + it a SIGUSR1. If the daemon is not running, it is started. This differs from a normal restart in that currently open connections are not aborted. A side effect is that old log files @@ -67,7 +67,12 @@ vlink="#000080" alink="#ff0000"> log files are closed before processing them. This command automatically checks the configura- tion files via configtest before initiating the - restart to make sure Apache doesn't die. + restart to make sure Apache doesn't die. On + certain platforms that do not allow USR1 to be + used for a graceful restart, an alternative + signal may be used (such as WINCH). apachectl + graceful will send the right signal for your + platform. configtest Run a configuration file syntax test. It parses the configuration files and either reports Syn- diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html index eb6502574ad..8830c6cdbc0 100644 --- a/docs/manual/stopping.html +++ b/docs/manual/stopping.html @@ -62,16 +62,20 @@ further requests are served.

Graceful Restart

-

Signal: WINCH
+

Signal: USR1
apachectl graceful

-

The WINCH signal causes the parent process to advise +

The USR1 signal causes the parent process to advise the children to exit after their current request (or to exit immediately if they're not serving anything). The parent re-reads its configuration files and re-opens its log files. As each child dies off the parent replaces it with a child from the new generation of the configuration, which begins serving new requests immediately.

+On certain platforms that do not allow USR1 to be used for a graceful +restart, an alternative signal may be used (such as WINCH). apachectl +graceful will send the right signal for your platform. +

This code is designed to always respect the MaxClients, MinSpareServers, and At present there is no way for a log rotation script using -WINCH to know for certain that all children writing the +USR1 to know for certain that all children writing the pre-restart log have finished. We suggest that you use a suitable delay -after sending the WINCH signal before you do anything with the +after sending the USR1 signal before you do anything with the old log. For example if most of your hits take less than 10 minutes to complete for users on low bandwidth links then you could wait 15 minutes before doing anything with the old log. diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en index eb6502574ad..8830c6cdbc0 100644 --- a/docs/manual/stopping.html.en +++ b/docs/manual/stopping.html.en @@ -62,16 +62,20 @@ further requests are served.

Graceful Restart

-

Signal: WINCH
+

Signal: USR1
apachectl graceful

-

The WINCH signal causes the parent process to advise +

The USR1 signal causes the parent process to advise the children to exit after their current request (or to exit immediately if they're not serving anything). The parent re-reads its configuration files and re-opens its log files. As each child dies off the parent replaces it with a child from the new generation of the configuration, which begins serving new requests immediately.

+On certain platforms that do not allow USR1 to be used for a graceful +restart, an alternative signal may be used (such as WINCH). apachectl +graceful will send the right signal for your platform. +

This code is designed to always respect the MaxClients, MinSpareServers, and At present there is no way for a log rotation script using -WINCH to know for certain that all children writing the +USR1 to know for certain that all children writing the pre-restart log have finished. We suggest that you use a suitable delay -after sending the WINCH signal before you do anything with the +after sending the USR1 signal before you do anything with the old log. For example if most of your hits take less than 10 minutes to complete for users on low bandwidth links then you could wait 15 minutes before doing anything with the old log. diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index d06bea5c5b1..dfd4370a8f5 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -100,10 +100,6 @@ eliminating the need for these directives.