diff options
| author | Andrei Belov <defan@nginx.com> | 2020-05-28 18:13:06 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2020-05-28 18:13:06 +0300 |
| commit | 733c14e991d6b2d5bdae5202ae9f090d022bc956 (patch) | |
| tree | 120562db5d30e5f4f51d001397f765f5cebab999 /src/nxt_external.c | |
| parent | 6a8d4571d7fc89a951b4da80c39a93fcaa634406 (diff) | |
| parent | 9d8e476c4e3695019b0a1fe3696d3411a8393de6 (diff) | |
| download | unit-733c14e991d6b2d5bdae5202ae9f090d022bc956.tar.gz unit-733c14e991d6b2d5bdae5202ae9f090d022bc956.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/nxt_external.c')
| -rw-r--r-- | src/nxt_external.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/nxt_external.c b/src/nxt_external.c index e498a938..6370a9c4 100644 --- a/src/nxt_external.c +++ b/src/nxt_external.c @@ -9,8 +9,7 @@ #include <nxt_unit.h> -static nxt_int_t nxt_external_init(nxt_task_t *task, - nxt_common_app_conf_t *conf); +static nxt_int_t nxt_external_start(nxt_task_t *task, nxt_process_data_t *data); nxt_app_module_t nxt_external_module = { @@ -19,7 +18,9 @@ nxt_app_module_t nxt_external_module = { nxt_string("external"), "*", NULL, - nxt_external_init, + 0, + NULL, + nxt_external_start, }; @@ -58,7 +59,7 @@ nxt_external_fd_no_cloexec(nxt_task_t *task, nxt_socket_t fd) static nxt_int_t -nxt_external_init(nxt_task_t *task, nxt_common_app_conf_t *conf) +nxt_external_start(nxt_task_t *task, nxt_process_data_t *data) { char **argv; u_char buf[256]; @@ -71,9 +72,11 @@ nxt_external_init(nxt_task_t *task, nxt_common_app_conf_t *conf) nxt_port_t *my_port, *main_port; nxt_runtime_t *rt; nxt_conf_value_t *value; + nxt_common_app_conf_t *conf; nxt_external_app_conf_t *c; rt = task->thread->runtime; + conf = data->app; main_port = rt->port_by_type[NXT_PROCESS_MAIN]; my_port = nxt_runtime_port_find(rt, nxt_pid, 0); @@ -99,7 +102,7 @@ nxt_external_init(nxt_task_t *task, nxt_common_app_conf_t *conf) "%PI,%ud,%d;" "%PI,%ud,%d;" "%d,%z,%Z", - NXT_VERSION, my_port->process->init->stream, + NXT_VERSION, my_port->process->stream, main_port->pid, main_port->id, main_port->pair[1], my_port->pid, my_port->id, my_port->pair[0], 2, conf->shm_limit); |