httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r240275 [3/3] - in /httpd/httpd/trunk/docs: man/ manual/ manual/mod/ manual/programs/
Date Fri, 26 Aug 2005 16:14:58 GMT
Modified: httpd/httpd/trunk/docs/manual/programs/apachectl.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/apachectl.html.en?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/apachectl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/apachectl.html.en Fri Aug 26 09:14:46 2005
@@ -120,6 +120,13 @@
 restart to make sure Apache doesn't die.  This is equivalent to
 <code>apachectl -k graceful</code>.</dd>
 
+<dt><code>graceful-stop</code></dt>
+
+<dd>Gracefully stops the Apache <code class="program"><a href="../programs/httpd.html">httpd</a></code>
daemon.  
+This differs from a normal stop in that currently open connections are not 
+aborted.  A side effect is that old log files will not be closed immediately. 
+This is equivalent to <code>apachectl -k graceful-stop</code>.</dd>
+
 <dt><code>configtest</code></dt>
 
 <dd>Run a configuration file syntax test. It parses the configuration

Modified: httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko [euc-kr] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:167936 (outdated) -->
+<!-- English Revision: 105989:240271 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/programs/httpd.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/httpd.html.en?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httpd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/httpd.html.en Fri Aug 26 09:14:46 2005
@@ -43,7 +43,8 @@
      [ -<strong>C</strong> <var>directive</var> ] [ -<strong>c</strong>
      <var>directive</var> ] [ -<strong>D</strong> <var>parameter</var>
]
      [ -<strong>e</strong> <var>level</var> ] [ -<strong>E</strong>
-     <var>file</var> ] [ <strong>-k</strong> start|restart|graceful|stop
]
+     <var>file</var> ] 
+     [ <strong>-k</strong> start|restart|graceful|stop|graceful-stop ]
      [ -<strong>R</strong> <var>directory</var> ] [ -<strong>h</strong>
]
      [ -<strong>l</strong> ] [ -<strong>L</strong> ] [ -<strong>S</strong>
]
      [ -<strong>t</strong> ] [ -<strong>v</strong> ] [ -<strong>V</strong>
]
@@ -74,7 +75,7 @@
 path relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
The default is
 <code>conf/httpd.conf</code>.</dd>
 
-<dt><code>-k <code>start|restart|graceful|stop</code></code></dt>
+<dt><code>-k <code>start|restart|graceful|stop|graceful-stop</code></code></dt>
 
 <dd>Signals <code>httpd</code> to start, restart, or stop.  See <a href="../stopping.html">Stopping
Apache</a> for more information.</dd>
 

Modified: httpd/httpd/trunk/docs/manual/programs/httpd.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/httpd.xml.ko?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httpd.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/httpd.xml.ko [euc-kr] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:151408 (outdated) -->
+<!-- English Revision: 105989:240271 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/stopping.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.html.en?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.html.en (original)
+++ httpd/httpd/trunk/docs/manual/stopping.html.en Fri Aug 26 09:14:46 2005
@@ -36,6 +36,7 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#term">Stop Now</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#graceful">Graceful
Restart</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#hup">Restart Now</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#gracefulstop">Graceful
Stop</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#race">Appendix: signals
and race conditions</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a
href="./programs/httpd.html">httpd</a></code></li><li><code
class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
@@ -63,7 +64,7 @@
 
     <p>The second method of signaling the <code class="program"><a href="./programs/httpd.html">httpd</a></code>
processes
     is to use the <code>-k</code> command line options: <code>stop</code>,
-    <code>restart</code>, and <code>graceful</code>,
+    <code>restart</code>, <code>graceful</code> and <code>graceful-stop</code>,
     as described below.  These are arguments to the <code class="program"><a href="./programs/httpd.html">httpd</a></code>
binary, but we recommend that
     you send them using the <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>
control script, which
     will pass them through to <code class="program"><a href="./programs/httpd.html">httpd</a></code>.</p>
@@ -103,11 +104,6 @@
     it with a child from the new <em>generation</em> of the
     configuration, which begins serving new requests immediately.</p>
 
-    <div class="note">On certain platforms that do not allow <code>USR1</code>
to
-    be used for a graceful restart, an alternative signal may be used (such
-    as <code>WINCH</code>). The command <code>apachectl graceful</code>
-    will send the right signal for your platform.</div>
-
     <p>This code is designed to always respect the process control
     directive of the MPMs, so the number of processes and threads
     available to serve clients will be maintained at the appropriate
@@ -182,6 +178,28 @@
 <div class="note">If your configuration file has errors in it when you issue a
 restart then your parent will not restart, it will exit with an
 error. See above for a method of avoiding this.</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
+<div class="section">
+<h2><a name="gracefulstop" id="gracefulstop">Graceful Stop</a></h2>
+
+<dl><dt>Signal: WINCH</dt>
+<dd><code>apachectl -k graceful-stop</code></dd>
+</dl>
+
+    <p>The <code>WINCH</code> or <code>graceful-stop</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 will then remove it's <code class="directive"><a
href="./mod/mpm_common.html#pidfile">PidFile</a></code> and cease listening
on
+    all ports. The parent will continue to run, and monitor children
+    which are handling requests. Once all children have finalised
+    and exited or the timeout specified by the <code class="directive"><a href="./mod/mpm_common.html#gracefulshutdowntimeout">GracefulShutdownTimeout</a></code>
has been
+    reached, the parent will also exit.</p>
+    
+    <p>A <code>TERM</code> signal will immediately terminate the 
+    parent process and all children when in the "graceful" state. However
+    as the <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
will
+    have been removed, you will not be able to use 
+    <code>apachectl</code> or <code>httpd</code> to send this signal,</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="race" id="race">Appendix: signals and race conditions</a></h2>

Modified: httpd/httpd/trunk/docs/manual/stopping.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.de?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.de Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 239255 -->
+<!-- English Revision: 239255:240271 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/stopping.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.es?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.es Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:239255 (outdated) -->
+<!-- English Revision: 105989:240271 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/stopping.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.ja?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.ja [iso-2022-jp] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:239255 (outdated) -->
+<!-- English Revision: 151408:240271 (outdated) -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/stopping.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.ko?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.ko [euc-kr] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:239255 (outdated) -->
+<!-- English Revision: 105989:240271 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,

Modified: httpd/httpd/trunk/docs/manual/stopping.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.meta?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.meta Fri Aug 26 09:14:46 2005
@@ -6,7 +6,7 @@
   <relpath>.</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
     <variant outdated="yes">ja</variant>



Mime
View raw message