Mercurial > hg > nginx-site
diff xml/en/docs/control.xml @ 837:6678b1f27514
Improved readability of "Upgrading Executable on the Fly".
The old text about what to do if the new executable fails to work
properly caused confusion.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 11 Feb 2013 11:44:48 +0400 |
parents | af3f38e349eb |
children | d1b5814e5265 |
line wrap: on
line diff
--- a/xml/en/docs/control.xml Thu Feb 07 16:59:59 2013 +0400 +++ b/xml/en/docs/control.xml Mon Feb 11 11:44:48 2013 +0400 @@ -8,7 +8,7 @@ <article name="Controlling nginx" link="/en/docs/control.html" lang="en" - rev="1"> + rev="2"> <section> @@ -212,35 +212,29 @@ <para> It should be noted that the old master process does not close its listen sockets, and it can be managed to start its worker processes again if needed. -If for some reason the new executable file works unacceptably, the following -can be done: +If for some reason the new executable file works unacceptably, one of the +following can be done: <list type="bullet"> <listitem> <para> Send the HUP signal to the old master process. -The old process will start new worker processes without re-reading the -configuration. -After that, new processes can be shut down gracefully, by sending -their master process the QUIT signal. +The old master process will start new worker processes +without re-reading the configuration. +After that, all new processes can be shut down gracefully, +by sending the QUIT signal to the old master process. </para> </listitem> <listitem> <para> -Send the TERM signal to the new master process, it will then send a -message to its worker processes requesting them to exit immediately, -and they will all exit almost immediately. +Send the TERM signal to the new master process. +It will then send a message to its worker processes requesting them +to exit immediately, and they will all exit almost immediately. +If the new worker processes do not exit for some reason, +the KILL signal should be sent to them. When the new master process exits, the old master process will start new -worker processes. -</para> -</listitem> - -<listitem> -<para> -If new processes do not exit, the KILL signal should be sent to them. -When the new master process exits, the old master process will start new -worker processes. +worker processes automatically. </para> </listitem> @@ -254,7 +248,7 @@ </para> <para> -If upgrade was successful, then the old master process can be sent +If upgrade was successful, then the old master process should be sent the QUIT signal, and only new processes will stay: <programlisting> PID PPID USER %CPU VSZ WCHAN COMMAND