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

Configuration: removed "reschedule_timeout" option.

Browse Source 
It's not used since cbcd76704c90.

This option is a leftover from previous IPC between router and applications
processes.  It was never documented, though.

Thanks to 洪志道 (Hong Zhi Dao).
This commit is contained in:
Valentin Bartenev
2020-08-21 20:50:04 +03:00
parent 10738c3fe2
commit dcfa92c161
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nxt_conf_validation.c
View File

@@ -496,12 +496,6 @@ static nxt_conf_vldt_object_t nxt_conf_vldt_app_limits_members[] = {
NULL, NULL,
NULL }, NULL },
{ nxt_string("reschedule_timeout"),
NXT_CONF_VLDT_INTEGER,
0,
NULL,
NULL },
{ nxt_string("requests"), { nxt_string("requests"),
NXT_CONF_VLDT_INTEGER, NXT_CONF_VLDT_INTEGER,
0, 0,

11
src/nxt_router.c
View File

@@ -24,7 +24,6 @@ typedef struct {
uint32_t max_processes; uint32_t max_processes;
uint32_t spare_processes; uint32_t spare_processes;
nxt_msec_t timeout; nxt_msec_t timeout;
nxt_msec_t res_timeout;
nxt_msec_t idle_timeout; nxt_msec_t idle_timeout;
uint32_t requests; uint32_t requests;
nxt_conf_value_t *limits_value; nxt_conf_value_t *limits_value;
@@ -1157,12 +1156,6 @@ static nxt_conf_map_t nxt_router_app_limits_conf[] = {
offsetof(nxt_router_app_conf_t, timeout), offsetof(nxt_router_app_conf_t, timeout),
}, },
{
nxt_string("reschedule_timeout"),
NXT_CONF_MAP_MSEC,
offsetof(nxt_router_app_conf_t, res_timeout),
},
{ {
nxt_string("requests"), nxt_string("requests"),
NXT_CONF_MAP_INT32, NXT_CONF_MAP_INT32,
@@ -1423,7 +1416,6 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
apcf.max_processes = 1; apcf.max_processes = 1;
apcf.spare_processes = 0; apcf.spare_processes = 0;
apcf.timeout = 0; apcf.timeout = 0;
apcf.res_timeout = 1000;
apcf.idle_timeout = 15000; apcf.idle_timeout = 15000;
apcf.requests = 0; apcf.requests = 0;
apcf.limits_value = NULL; apcf.limits_value = NULL;
@@ -1505,8 +1497,6 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
nxt_debug(task, "application type: %V", &apcf.type); nxt_debug(task, "application type: %V", &apcf.type);
nxt_debug(task, "application processes: %D", apcf.processes); nxt_debug(task, "application processes: %D", apcf.processes);
nxt_debug(task, "application request timeout: %M", apcf.timeout); nxt_debug(task, "application request timeout: %M", apcf.timeout);
nxt_debug(task, "application reschedule timeout: %M",
apcf.res_timeout);
nxt_debug(task, "application requests: %D", apcf.requests); nxt_debug(task, "application requests: %D", apcf.requests);
lang = nxt_app_lang_module(task->thread->runtime, &apcf.type); lang = nxt_app_lang_module(task->thread->runtime, &apcf.type);
@@ -1537,7 +1527,6 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
app->max_pending_processes = apcf.spare_processes app->max_pending_processes = apcf.spare_processes
? apcf.spare_processes : 1; ? apcf.spare_processes : 1;
app->timeout = apcf.timeout; app->timeout = apcf.timeout;
app->res_timeout = apcf.res_timeout * 1000000;
app->idle_timeout = apcf.idle_timeout; app->idle_timeout = apcf.idle_timeout;
app->max_requests = apcf.requests; app->max_requests = apcf.requests;

1
src/nxt_router.h
View File

@@ -126,7 +126,6 @@ struct nxt_app_s {
uint32_t max_requests; uint32_t max_requests;
nxt_msec_t timeout; nxt_msec_t timeout;
nxt_nsec_t res_timeout;
nxt_msec_t idle_timeout; nxt_msec_t idle_timeout;
nxt_str_t *targets; nxt_str_t *targets;