httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/programs apachectl.html
Date Thu, 20 Sep 2001 03:05:33 GMT
jerenkrantz    01/09/19 20:05:32

  Modified:    docs/man apachectl.8
               docs/manual stopping.html upgrading.html.en
                        upgrading.html.fr
               docs/manual/programs apachectl.html
  Log:
  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.
  
  Revision  Changes    Path
  1.6       +4 -1      httpd-2.0/docs/man/apachectl.8
  
  Index: apachectl.8
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/man/apachectl.8,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apachectl.8	2001/02/16 04:26:28	1.5
  +++ apachectl.8	2001/09/20 03:05:32	1.6
  @@ -109,7 +109,7 @@
   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 @@
   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
  
  
  
  1.21      +8 -4      httpd-2.0/docs/manual/stopping.html
  
  Index: stopping.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/stopping.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- stopping.html	2001/02/27 21:45:02	1.20
  +++ stopping.html	2001/09/20 03:05:32	1.21
  @@ -62,16 +62,20 @@
   
   <H3>Graceful Restart</H3>
   
  -<p><strong>Signal:</strong> WINCH<br>
  +<p><strong>Signal:</strong> USR1<br>
   <code>apachectl graceful</code></p>
   
  -<P>The <CODE>WINCH</CODE> signal causes the parent process to <EM>advise</EM>
  +<P>The <CODE>USR1</CODE> signal causes the parent process to <EM>advise</EM>
   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 <EM>generation</EM> of the
   configuration, which begins serving new requests immediately.</p>
   
  +<I>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.</I>
  +
   <P>This code is designed to always respect the <A
   HREF="mod/mpm_common.html#maxclients">MaxClients</A>, <A
   HREF="mod/prefork.html#minspareservers">MinSpareServers</A>, and <A
  @@ -100,9 +104,9 @@
   restart was given.
   
   <P>At present there is no way for a log rotation script using
  -<CODE>WINCH</CODE> to know for certain that all children writing the
  +<CODE>USR1</CODE> 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 <CODE>WINCH</CODE> signal before you do anything with the
  +after sending the <CODE>USR1</CODE> 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.
  
  
  
  1.14      +0 -4      httpd-2.0/docs/manual/upgrading.html.en
  
  Index: upgrading.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/upgrading.html.en,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- upgrading.html.en	2001/08/30 20:50:05	1.13
  +++ upgrading.html.en	2001/09/20 03:05:32	1.14
  @@ -100,10 +100,6 @@
   
   <UL>
   
  -<li>Graceful restarts of the server are now executed by signaling the
  -parent process with <code>WINCH</code> rather than
  -<code>USR1</code>.</li>
  -
   <li>The <code>httpd</code> command line option <code>-S</code>
   which was used for printing the virtual host configuration has
   been replaced by <code>-t -D DUMP_VHOSTS</code>.</li>
  
  
  
  1.4       +0 -4      httpd-2.0/docs/manual/upgrading.html.fr
  
  Index: upgrading.html.fr
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/upgrading.html.fr,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- upgrading.html.fr	2001/08/30 20:50:05	1.3
  +++ upgrading.html.fr	2001/09/20 03:05:32	1.4
  @@ -97,10 +97,6 @@
   
   <UL>
   
  -<li>Le redémarrage en douceur du serveur est maintenant traité en envoyant
  -au processus père le signal <code>WINCH</code> à la place du 
  -signal <code>USR1</code>.</li>
  -
   <li>L'option <code>-S</code> du programme <code>httpd</code>
   qui servait à afficher la configuration des hôtes virtuels est 
   remplacé par <code>-t -D DUMP_VHOSTS</code>.</li>
  
  
  
  1.3       +7 -2      httpd-2.0/docs/manual/programs/apachectl.html
  
  Index: apachectl.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/programs/apachectl.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apachectl.html	2001/01/27 23:16:18	1.2
  +++ apachectl.html	2001/09/20 03:05:32	1.3
  @@ -57,7 +57,7 @@
                    requests currently being served is omitted.
   
        <strong>graceful    </strong>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 @@
                    log files are  closed  before  processing  them.
                    This command automatically checks the configura-
                    tion files via <strong>configtest </strong>before initiating
 the
  -                 restart to make sure Apache doesn't die.
  +                 restart to make sure  Apache  doesn't  die.   <i>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.</i>
   
        <strong>configtest  </strong>Run a configuration file syntax test. It
 parses
                    the  configuration files and either reports <strong>Syn-</strong>
  
  
  

Mime
View raw message