technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed controller restarting.

Browse Source 
Previously, stored configuration wasn't reread on controller
process restart, which resulted in segmentation fault.
This commit is contained in:
Valentin Bartenev
2017-10-19 17:43:54 +03:00
parent fc6520d722
commit e7d81186b5
2 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/nxt_main_process.c
View File

@@ -25,6 +25,8 @@ static nxt_int_t nxt_main_process_port_create(nxt_task_t *task,
static void nxt_main_process_title(nxt_task_t *task); static void nxt_main_process_title(nxt_task_t *task);
static nxt_int_t nxt_main_start_controller_process(nxt_task_t *task, static nxt_int_t nxt_main_start_controller_process(nxt_task_t *task,
nxt_runtime_t *rt); nxt_runtime_t *rt);
static nxt_int_t nxt_main_create_controller_process(nxt_task_t *task,
nxt_runtime_t *rt, nxt_process_init_t *init);
static nxt_int_t nxt_main_start_router_process(nxt_task_t *task, static nxt_int_t nxt_main_start_router_process(nxt_task_t *task,
nxt_runtime_t *rt); nxt_runtime_t *rt);
static nxt_int_t nxt_main_start_discovery_process(nxt_task_t *task, static nxt_int_t nxt_main_start_discovery_process(nxt_task_t *task,
@@ -323,13 +325,36 @@ nxt_main_process_title(nxt_task_t *task)
static nxt_int_t static nxt_int_t
nxt_main_start_controller_process(nxt_task_t *task, nxt_runtime_t *rt) nxt_main_start_controller_process(nxt_task_t *task, nxt_runtime_t *rt)
{ {
ssize_t n;
nxt_int_t ret;
nxt_str_t conf;
nxt_file_t file;
nxt_file_info_t fi;
nxt_process_init_t *init; nxt_process_init_t *init;
init = nxt_malloc(sizeof(nxt_process_init_t));
if (nxt_slow_path(init == NULL)) {
return NXT_ERROR;
}
init->start = nxt_controller_start;
init->name = "controller";
init->user_cred = &rt->user_cred;
init->port_handlers = &nxt_controller_process_port_handlers;
init->signals = nxt_worker_process_signals;
init->type = NXT_PROCESS_CONTROLLER;
init->stream = 0;
init->restart = &nxt_main_create_controller_process;
return nxt_main_create_controller_process(task, rt, init);;
}
static nxt_int_t
nxt_main_create_controller_process(nxt_task_t *task, nxt_runtime_t *rt,
nxt_process_init_t *init)
{
ssize_t n;
nxt_int_t ret;
nxt_str_t conf;
nxt_file_t file;
nxt_file_info_t fi;
conf.length = 0; conf.length = 0;
nxt_memzero(&file, sizeof(nxt_file_t)); nxt_memzero(&file, sizeof(nxt_file_t));
@@ -365,20 +390,7 @@ nxt_main_start_controller_process(nxt_task_t *task, nxt_runtime_t *rt)
nxt_file_close(task, &file); nxt_file_close(task, &file);
} }
init = nxt_malloc(sizeof(nxt_process_init_t));
if (nxt_slow_path(init == NULL)) {
return NXT_ERROR;
}
init->start = nxt_controller_start;
init->name = "controller";
init->user_cred = &rt->user_cred;
init->port_handlers = &nxt_controller_process_port_handlers;
init->signals = nxt_worker_process_signals;
init->type = NXT_PROCESS_CONTROLLER;
init->data = &conf; init->data = &conf;
init->stream = 0;
init->restart = 1;
ret = nxt_main_create_worker_process(task, rt, init); ret = nxt_main_create_worker_process(task, rt, init);
@@ -408,7 +420,7 @@ nxt_main_start_discovery_process(nxt_task_t *task, nxt_runtime_t *rt)
init->type = NXT_PROCESS_DISCOVERY; init->type = NXT_PROCESS_DISCOVERY;
init->data = rt; init->data = rt;
init->stream = 0; init->stream = 0;
init->restart = 0; init->restart = NULL;
return nxt_main_create_worker_process(task, rt, init); return nxt_main_create_worker_process(task, rt, init);
} }
@@ -432,7 +444,7 @@ nxt_main_start_router_process(nxt_task_t *task, nxt_runtime_t *rt)
init->type = NXT_PROCESS_ROUTER; init->type = NXT_PROCESS_ROUTER;
init->data = rt; init->data = rt;
init->stream = 0; init->stream = 0;
init->restart = 1; init->restart = &nxt_main_create_worker_process;
return nxt_main_create_worker_process(task, rt, init); return nxt_main_create_worker_process(task, rt, init);
} }
@@ -494,7 +506,7 @@ nxt_main_start_worker_process(nxt_task_t *task, nxt_runtime_t *rt,
init->type = NXT_PROCESS_WORKER; init->type = NXT_PROCESS_WORKER;
init->data = app_conf; init->data = app_conf;
init->stream = stream; init->stream = stream;
init->restart = 0; init->restart = NULL;
return nxt_main_create_worker_process(task, rt, init); return nxt_main_create_worker_process(task, rt, init);
} }
@@ -810,8 +822,8 @@ nxt_main_cleanup_worker_process(nxt_task_t *task, nxt_pid_t pid)
} }
} else if (init != NULL) { } else if (init != NULL) {
if (init->restart != 0) { if (init->restart != NULL) {
(void) nxt_main_create_worker_process(task, rt, init); init->restart(task, rt, init);
} else { } else {
nxt_free(init); nxt_free(init);

4
src/nxt_process.h
View File

@@ -23,6 +23,8 @@ typedef struct {
typedef struct nxt_process_init_s nxt_process_init_t; typedef struct nxt_process_init_s nxt_process_init_t;
typedef nxt_int_t (*nxt_process_start_t)(nxt_task_t *task, void *data); typedef nxt_int_t (*nxt_process_start_t)(nxt_task_t *task, void *data);
typedef nxt_int_t (*nxt_process_restart_t)(nxt_task_t *task, nxt_runtime_t *rt,
nxt_process_init_t *init);
struct nxt_process_init_s { struct nxt_process_init_s {
@@ -38,7 +40,7 @@ struct nxt_process_init_s {
void *data; void *data;
uint32_t stream; uint32_t stream;
nxt_bool_t restart; nxt_process_restart_t restart;
}; };