Mercurial > hg > nginx-site

changeset 1927:75d2478260f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented the "worker_shutdown_timeout" directive.
author Yaroslav Zhuravlev <yar@nginx.com>
date Thu, 09 Mar 2017 17:20:12 +0300
parents 88228d493640
children 2c14a16c61eb
files xml/en/docs/ngx_core_module.xml xml/ru/docs/ngx_core_module.xml
diffstat 2 files changed, 34 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/ngx_core_module.xml	Thu Mar 09 14:00:31 2017 +0000
+++ b/xml/en/docs/ngx_core_module.xml	Thu Mar 09 17:20:12 2017 +0300
@@ -10,7 +10,7 @@
 <module name="Core functionality"
         link="/en/docs/ngx_core_module.html"
         lang="en"
-        rev="23">
+        rev="24">
 
 <section id="example" name="Example Configuration">
 
@@ -701,6 +701,22 @@
 </directive>
 
 
+<directive name="worker_shutdown_timeout">
+<syntax><value>time</value></syntax>
+<default/>
+<context>main</context>
+<appeared-in>1.11.11</appeared-in>
+
+<para>
+Configures a timeout for a graceful shutdown of worker processes.
+When the <value>time</value> expires,
+nginx will try to close all the connections currently open
+to facilitate shutdown.
+</para>
+
+</directive>
+
+
 <directive name="working_directory">
 <syntax><value>directory</value></syntax>
 <default/>
--- a/xml/ru/docs/ngx_core_module.xml	Thu Mar 09 14:00:31 2017 +0000
+++ b/xml/ru/docs/ngx_core_module.xml	Thu Mar 09 17:20:12 2017 +0300
@@ -10,7 +10,7 @@
 <module name="Основная функциональность"
         link="/ru/docs/ngx_core_module.html"
         lang="ru"
-        rev="23">
+        rev="24">
 
 <section id="example" name="Пример конфигурации">
 
@@ -701,6 +701,22 @@
 </directive>
 
 
+<directive name="worker_shutdown_timeout">
+<syntax><value>время</value></syntax>
+<default/>
+<context>main</context>
+<appeared-in>1.11.11</appeared-in>
+
+<para>
+Задаёт таймаут в секундах для плавного завершения рабочих процессов.
+По истечении указанного <value>времени</value>
+nginx попытается закрыть все открытые соединения
+для ускорения завершения.
+</para>
+
+</directive>
+
+
 <directive name="working_directory">
 <syntax><value>каталог</value></syntax>
 <default/>