summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2020-08-21 20:50:04 +0300
committerValentin Bartenev <vbart@nginx.com>2020-08-21 20:50:04 +0300
commitdcfa92c161296af903fc1ebd4ddb98d1c38c59e7 (patch)
tree5bc21754613f1e90da87229127b376a93cf70a14
parent10738c3fe22d2c46669630e55e465c5c8a84c77c (diff)
downloadunit-dcfa92c161296af903fc1ebd4ddb98d1c38c59e7.tar.gz
unit-dcfa92c161296af903fc1ebd4ddb98d1c38c59e7.tar.bz2
Configuration: removed "reschedule_timeout" option.
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).
Diffstat (limited to '')
-rw-r--r--src/nxt_conf_validation.c6
-rw-r--r--src/nxt_router.c11
-rw-r--r--src/nxt_router.h1
3 files changed, 0 insertions, 18 deletions
diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index 4c979782..16ed87c6 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -496,12 +496,6 @@ static nxt_conf_vldt_object_t nxt_conf_vldt_app_limits_members[] = {
NULL,
NULL },
- { nxt_string("reschedule_timeout"),
- NXT_CONF_VLDT_INTEGER,
- 0,
- NULL,
- NULL },
-
{ nxt_string("requests"),
NXT_CONF_VLDT_INTEGER,
0,
diff --git a/src/nxt_router.c b/src/nxt_router.c
index 0e1de6fa..c08bf7d7 100644
--- a/src/nxt_router.c
+++ b/src/nxt_router.c
@@ -24,7 +24,6 @@ typedef struct {
uint32_t max_processes;
uint32_t spare_processes;
nxt_msec_t timeout;
- nxt_msec_t res_timeout;
nxt_msec_t idle_timeout;
uint32_t requests;
nxt_conf_value_t *limits_value;
@@ -1158,12 +1157,6 @@ static nxt_conf_map_t nxt_router_app_limits_conf[] = {
},
{
- nxt_string("reschedule_timeout"),
- NXT_CONF_MAP_MSEC,
- offsetof(nxt_router_app_conf_t, res_timeout),
- },
-
- {
nxt_string("requests"),
NXT_CONF_MAP_INT32,
offsetof(nxt_router_app_conf_t, requests),
@@ -1423,7 +1416,6 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
apcf.max_processes = 1;
apcf.spare_processes = 0;
apcf.timeout = 0;
- apcf.res_timeout = 1000;
apcf.idle_timeout = 15000;
apcf.requests = 0;
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 processes: %D", apcf.processes);
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);
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
? apcf.spare_processes : 1;
app->timeout = apcf.timeout;
- app->res_timeout = apcf.res_timeout * 1000000;
app->idle_timeout = apcf.idle_timeout;
app->max_requests = apcf.requests;
diff --git a/src/nxt_router.h b/src/nxt_router.h
index 81b3538c..512f1810 100644
--- a/src/nxt_router.h
+++ b/src/nxt_router.h
@@ -126,7 +126,6 @@ struct nxt_app_s {
uint32_t max_requests;
nxt_msec_t timeout;
- nxt_nsec_t res_timeout;
nxt_msec_t idle_timeout;
nxt_str_t *targets;