From a8a7eeb1fc7aada17d0d8fe8e15d325525986937 Mon Sep 17 00:00:00 2001
From: Tiago Natel de Moura <t.nateldemoura@f5.com>
Date: Thu, 20 Aug 2020 15:22:58 +0100
Subject: Moved isolation related code to "nxt_isolation.c".

---
 src/nxt_main_process.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/nxt_main_process.c')

diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c
index 48eb2abb..a7b84b73 100644
--- a/src/nxt_main_process.c
+++ b/src/nxt_main_process.c
@@ -878,11 +878,9 @@ nxt_main_cleanup_process(nxt_task_t *task, nxt_pid_t pid)
         return;
     }
 
-#if (NXT_HAVE_ISOLATION_ROOTFS)
-    if (process->isolation.rootfs != NULL && process->isolation.mounts) {
-        (void) nxt_process_unmount_all(task, process);
+    if (process->isolation.cleanup != NULL) {
+        process->isolation.cleanup(task, process);
     }
-#endif
 
     name = process->name;
     stream = process->stream;
-- 
cgit 


From b65a8636bb5b2ee61c69660aa6f7edc7d909e632 Mon Sep 17 00:00:00 2001
From: Tiago Natel de Moura <t.nateldemoura@f5.com>
Date: Tue, 25 Aug 2020 15:25:51 +0100
Subject: Isolation: added "automount" option.

Now it's possible to disable default bind mounts of
languages by setting:

  {
      "isolation": {
           "automount": {
               "language_deps": false
           }
     }
  }

In this case, the user is responsible to provide a "rootfs"
containing the language libraries and required files for
the application.
---
 src/nxt_main_process.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/nxt_main_process.c')

diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c
index a7b84b73..544a0cbd 100644
--- a/src/nxt_main_process.c
+++ b/src/nxt_main_process.c
@@ -1290,6 +1290,8 @@ nxt_main_port_modules_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg)
                 goto fail;
             }
 
+            mnt->builtin = 1;
+
             ret = nxt_conf_map_object(rt->mem_pool, value,
                                       nxt_app_lang_mounts_map,
                                       nxt_nitems(nxt_app_lang_mounts_map), mnt);
-- 
cgit 


From f16ae01b12e612701f44c028f188d1ded58d0358 Mon Sep 17 00:00:00 2001
From: Max Romanov <max.romanov@nginx.com>
Date: Fri, 18 Sep 2020 13:41:58 +0300
Subject: Python: app module callable name configuration.

Now it is possible to specify the name of the application callable using
optional parameter 'callable'.  Default value is 'application'.

This closes #290 issue on GitHub.
---
 src/nxt_main_process.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/nxt_main_process.c')

diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c
index 544a0cbd..d2edab1d 100644
--- a/src/nxt_main_process.c
+++ b/src/nxt_main_process.c
@@ -191,6 +191,12 @@ static nxt_conf_map_t  nxt_python_app_conf[] = {
         NXT_CONF_MAP_STR,
         offsetof(nxt_common_app_conf_t, u.python.module),
     },
+
+    {
+        nxt_string("callable"),
+        NXT_CONF_MAP_CSTRZ,
+        offsetof(nxt_common_app_conf_t, u.python.callable),
+    },
 };
 
 
-- 
cgit