Isolation: fixed the generation of mounts table.
Since the introduction of rootfs feature, some language modules can't be configured multiple times. Now the configure generates a separate nxt_<module>_mounts.h for each module compiled.
This commit is contained in:
@@ -26,7 +26,8 @@
|
||||
#include "java/nxt_jni_URLClassLoader.h"
|
||||
|
||||
#include "nxt_jars.h"
|
||||
#include "nxt_java_mounts.h"
|
||||
|
||||
#include NXT_JAVA_MOUNTS_H
|
||||
|
||||
static nxt_int_t nxt_java_setup(nxt_task_t *task, nxt_process_t *process,
|
||||
nxt_common_app_conf_t *conf);
|
||||
|
||||
@@ -18,7 +18,8 @@
|
||||
#include <nxt_unit_field.h>
|
||||
#include <nxt_unit_request.h>
|
||||
#include <nxt_unit_response.h>
|
||||
#include <nxt_python_mounts.h>
|
||||
|
||||
#include NXT_PYTHON_MOUNTS_H
|
||||
|
||||
/*
|
||||
* According to "PEP 3333 / A Note On String Types"
|
||||
@@ -39,11 +40,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#define _NXT_PYTHON_MOUNTS(major, minor) \
|
||||
nxt_python ## major ## minor ## _mounts
|
||||
|
||||
#define NXT_PYTHON_MOUNTS(major, minor) _NXT_PYTHON_MOUNTS(major, minor)
|
||||
|
||||
#if PY_MAJOR_VERSION == 3
|
||||
#define NXT_PYTHON_BYTES_TYPE "bytestring"
|
||||
|
||||
@@ -123,8 +119,8 @@ NXT_EXPORT nxt_app_module_t nxt_app_module = {
|
||||
compat,
|
||||
nxt_string("python"),
|
||||
PY_VERSION,
|
||||
NXT_PYTHON_MOUNTS(PY_MAJOR_VERSION, PY_MINOR_VERSION),
|
||||
nxt_nitems(NXT_PYTHON_MOUNTS(PY_MAJOR_VERSION, PY_MINOR_VERSION)),
|
||||
nxt_python_mounts,
|
||||
nxt_nitems(nxt_python_mounts),
|
||||
NULL,
|
||||
nxt_python_start,
|
||||
};
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
|
||||
#include <nxt_unit.h>
|
||||
#include <nxt_unit_request.h>
|
||||
#include <nxt_ruby_mounts.h>
|
||||
|
||||
#include NXT_RUBY_MOUNTS_H
|
||||
|
||||
|
||||
#define NXT_RUBY_RACK_API_VERSION_MAJOR 1
|
||||
|
||||
Reference in New Issue
Block a user