Mercurial > hg > nginx-site

changeset 1495:8d134b482cc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented zone usage with many upstreams.
author Yaroslav Zhuravlev <yar@nginx.com>
date Wed, 27 May 2015 18:06:02 +0300
parents 7ef6df8b652e
children 99ce48c8cce3
files xml/en/docs/http/ngx_http_upstream_module.xml xml/en/docs/stream/ngx_stream_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml
diffstat 3 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml
+++ b/xml/en/docs/http/ngx_http_upstream_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_upstream_module"
         link="/en/docs/http/ngx_http_upstream_module.html"
         lang="en"
-        rev="38">
+        rev="39">
 
 <section id="summary">
 
@@ -283,7 +283,7 @@ are ignored, and such a server will neve
 
 
 <directive name="zone">
-<syntax><value>name</value> <value>size</value></syntax>
+<syntax><value>name</value> [<value>size</value>]</syntax>
 <default/>
 <context>upstream</context>
 <appeared-in>1.9.0</appeared-in>
@@ -292,6 +292,8 @@ are ignored, and such a server will neve
 Defines the <value>name</value> and <value>size</value> of the shared
 memory zone that keeps the group’s configuration and run-time state that are
 shared between worker processes.
+Several groups may share the same zone.
+In this case, it is enough to specify the <value>size</value> only once.
 </para>
 
 <para>
--- a/xml/en/docs/stream/ngx_stream_upstream_module.xml
+++ b/xml/en/docs/stream/ngx_stream_upstream_module.xml
@@ -9,7 +9,7 @@
 <module name="Module ngx_stream_upstream_module"
         link="/en/docs/stream/ngx_stream_upstream_module.html"
         lang="en"
-        rev="6">
+        rev="7">
 
 <section id="summary">
 
@@ -266,7 +266,7 @@ are ignored, and such a server will neve
 
 
 <directive name="zone">
-<syntax><value>name</value> <value>size</value></syntax>
+<syntax><value>name</value> [<value>size</value>]</syntax>
 <default/>
 <context>upstream</context>
 
@@ -274,6 +274,8 @@ are ignored, and such a server will neve
 Defines the <value>name</value> and <value>size</value> of the shared
 memory zone that keeps the group’s configuration and run-time state that are
 shared between worker processes.
+Several groups may share the same zone.
+In this case, it is enough to specify the zone size only once.
 </para>
 
 <para>
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml
+++ b/xml/ru/docs/http/ngx_http_upstream_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_upstream_module"
         link="/ru/docs/http/ngx_http_upstream_module.html"
         lang="ru"
-        rev="38">
+        rev="39">
 
 <section id="summary">
 
@@ -284,7 +284,7 @@ http {
 
 
 <directive name="zone">
-<syntax><value>имя</value> <value>размер</value></syntax>
+<syntax><value>имя</value> [<value>размер</value>]</syntax>
 <default/>
 <context>upstream</context>
 <appeared-in>1.9.0</appeared-in>
@@ -293,6 +293,8 @@ http {
 Задаёт <value>имя</value> и <value>размер</value> зоны разделяемой памяти,
 в которой хранятся конфигурация группы и её рабочее состояние,
 разделяемые между рабочими процессами.
+В одной и той же зоне могут быть сразу несколько групп.
+В этом случае достаточно указать <value>размер</value> только один раз.
 </para>
 
 <para>