summaryrefslogtreecommitdiffhomepage
path: root/src/nxt_main_process.c
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2022-12-15 08:17:39 -0800
committerKonstantin Pavlov <thresh@nginx.com>2022-12-15 08:17:39 -0800
commite22669f2728814aba82da14702d18bfa9685311e (patch)
treec9c9471dab359e8e33fca24c5d4f035ab5b278db /src/nxt_main_process.c
parenta1d28488f9df8e28ee25ea438c275b96b9afe5b6 (diff)
parent4409a10ff0bd6bb45fb88716bd383cd867958a8a (diff)
downloadunit-e22669f2728814aba82da14702d18bfa9685311e.tar.gz
unit-e22669f2728814aba82da14702d18bfa9685311e.tar.bz2
Merged with the default branch.
Diffstat (limited to 'src/nxt_main_process.c')
-rw-r--r--src/nxt_main_process.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c
index 39a8e112..de41e8d7 100644
--- a/src/nxt_main_process.c
+++ b/src/nxt_main_process.c
@@ -191,18 +191,6 @@ static nxt_conf_map_t nxt_python_app_conf[] = {
},
{
- nxt_string("module"),
- 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),
- },
-
- {
nxt_string("protocol"),
NXT_CONF_MAP_STR,
offsetof(nxt_common_app_conf_t, u.python.protocol),
@@ -1019,6 +1007,10 @@ nxt_main_process_cleanup(nxt_task_t *task, nxt_process_t *process)
if (process->isolation.cleanup != NULL) {
process->isolation.cleanup(task, process);
}
+
+ if (process->isolation.cgroup_cleanup != NULL) {
+ process->isolation.cgroup_cleanup(task, process);
+ }
}