changeset 2517:ba9bfd064a61

Renamed and corrected example in njs.
author Yaroslav Zhuravlev <yar@nginx.com>
date Tue, 24 Mar 2020 10:12:27 +0000
parents 4ca808544013
children b4f57de67730
files xml/en/docs/njs/examples.xml xml/ru/docs/njs/examples.xml
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/njs/examples.xml
+++ b/xml/en/docs/njs/examples.xml
@@ -9,7 +9,7 @@
 <article name="Examples"
         link="/en/docs/njs/examples.html"
         lang="en"
-        rev="8">
+        rev="9">
 
 <section id="helloword" name="Hello World">
 
@@ -354,14 +354,14 @@ are available as part of our
 </section>
 
 
-<section id="promisified_subrequest" name="Promisified Subrequest">
+<section id="subrequests_chaining" name="Subrequests Chaining">
 
 <para>
 The example works since
 <link doc="changes.xml" id="njs0.3.8">0.3.8</link>.
 <path>nginx.conf</path>:
 <example>
-js_include promisified_subrequest.js;
+js_include subrequests_chaining.js;
 
 location /start {
     js_content content;
@@ -378,16 +378,16 @@ location /backend {
 </para>
 
 <para>
-<path>promisified_subrequest.js</path>:
+<path>subrequests_chaining.js</path>:
 <example>
 function content(r) {
-   r.subrequest(r, '/auth')
+   r.subrequest('/auth')
    .then(reply => JSON.parse(reply.responseBody))
    .then(response => {
        if (!response['token']) {
            throw new Error("token is not available");
        }
-       return token;
+       return reply['token'];
    })
   .then(token => {
       r.subrequest('/backend', `token=${token}`)
--- a/xml/ru/docs/njs/examples.xml
+++ b/xml/ru/docs/njs/examples.xml
@@ -9,7 +9,7 @@
 <article name="Примеры использования"
         link="/ru/docs/njs/examples.html"
         lang="ru"
-        rev="8">
+        rev="9">
 
 <section id="helloword" name="Hello World">
 
@@ -354,14 +354,14 @@ function num_requests(r)
 </section>
 
 
-<section id="promisified_subrequest" name="Подзапрос с promise">
+<section id="subrequests_chaining" name="Построение цепочки подзапросов">
 
 <para>
 Пример работает начиная с версии
 <link doc="changes.xml" id="njs0.3.8">0.3.8</link>.
 <path>nginx.conf</path>:
 <example>
-js_include promisified_subrequest.js;
+js_include subrequests_chaining.js;
 
 location /start {
     js_content content;
@@ -378,16 +378,16 @@ location /backend {
 </para>
 
 <para>
-<path>promisified_subrequest.js</path>:
+<path>subrequests_chaining.js</path>:
 <example>
 function content(r) {
-   r.subrequest(r, '/auth')
+   r.subrequest('/auth')
    .then(reply => JSON.parse(reply.responseBody))
    .then(response => {
        if (!response['token']) {
            throw new Error("token is not available");
        }
-       return token;
+       return reply['token'];
    })
   .then(token => {
       r.subrequest('/backend', `token=${token}`)