diff options
| -rw-r--r-- | src/nxt_conf_validation.c | 27 | ||||
| -rw-r--r-- | test/test_python_procman.py | 5 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c index 33e739ea..ea160d8e 100644 --- a/src/nxt_conf_validation.c +++ b/src/nxt_conf_validation.c @@ -544,8 +544,6 @@ nxt_conf_vldt_processes(nxt_conf_validation_t *vldt, nxt_conf_value_t *value, nxt_int_t ret; nxt_conf_vldt_processes_conf_t proc; - static nxt_str_t max_str = nxt_string("max"); - if (nxt_conf_type(value) == NXT_CONF_INTEGER) { int_value = nxt_conf_get_integer(value); @@ -589,22 +587,19 @@ nxt_conf_vldt_processes(nxt_conf_validation_t *vldt, nxt_conf_value_t *value, "not exceed %d.", NXT_INT32_T_MAX); } - if (nxt_conf_get_object_member(value, &max_str, NULL) != NULL) { - - if (proc.max < 1) { - return nxt_conf_vldt_error(vldt, "The \"max\" number must be equal " - "to or greater than 1."); - } + if (proc.max < 1) { + return nxt_conf_vldt_error(vldt, "The \"max\" number must be equal " + "to or greater than 1."); + } - if (proc.max > NXT_INT32_T_MAX) { - return nxt_conf_vldt_error(vldt, "The \"max\" number must not " - "not exceed %d.", NXT_INT32_T_MAX); - } + if (proc.max > NXT_INT32_T_MAX) { + return nxt_conf_vldt_error(vldt, "The \"max\" number must not " + "not exceed %d.", NXT_INT32_T_MAX); + } - if (proc.max < proc.spare) { - return nxt_conf_vldt_error(vldt, "The \"spare\" number must be " - "lower than \"max\"."); - } + if (proc.max < proc.spare) { + return nxt_conf_vldt_error(vldt, "The \"spare\" number must be " + "lower than \"max\"."); } if (proc.idle_timeout < 0) { diff --git a/test/test_python_procman.py b/test/test_python_procman.py index 523067f8..52f5ac96 100644 --- a/test/test_python_procman.py +++ b/test/test_python_procman.py @@ -67,6 +67,11 @@ def application(env, start_response): self.assertIn('error', self.conf_get('/applications/' + self.app_name + '/processes/idle_timeout'), 'idle_timeout no access') + def test_python_processes_spare_gt_max_default(self): + self.assertIn('error', self.conf({"spare": 2}, + '/applications/' + self.app_name + '/processes'), + 'spare greater than max default') + def test_python_processes_spare_gt_max(self): self.assertIn('error', self.conf({ "spare": 2, |