summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Loyet <fat@php.net>2010-11-11 12:56:44 +0000
committerJérôme Loyet <fat@php.net>2010-11-11 12:56:44 +0000
commitb896c87bb52282243251bde25b2523a9e4a8bc34 (patch)
treec9c65bc14aa659d2d561b22ec05deda7b2be1ddf
parent9f1ad0a2e256e59c58e8b755f68fe21ca52298cd (diff)
downloadphp-git-b896c87bb52282243251bde25b2523a9e4a8bc34.tar.gz
- remove useless check
-rw-r--r--sapi/fpm/fpm/fpm_process_ctl.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c
index 2a4011ee80..0c6a6cdf2e 100644
--- a/sapi/fpm/fpm/fpm_process_ctl.c
+++ b/sapi/fpm/fpm/fpm_process_ctl.c
@@ -333,8 +333,7 @@ static void fpm_pctl_perform_idle_server_maintenance(struct timeval *now, struct
if (wp->config == NULL) continue;
for (child = wp->children; child; child = child->next) {
- int ret = fpm_request_is_idle(child);
- if (ret == 1) {
+ if (fpm_request_is_idle(child)) {
if (last_idle_child == NULL) {
last_idle_child = child;
} else {
@@ -343,16 +342,11 @@ static void fpm_pctl_perform_idle_server_maintenance(struct timeval *now, struct
}
}
idle++;
- } else if (ret == 0) {
+ } else {
active++;
}
}
- if ((active + idle) != wp->running_children) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "[pool %s] unable to retrieve process activity of one or more child(ren). Will try again later.", wp->config->name);
- continue;
- }
-
/* update status structure for all PMs */
if (0 > fpm_socket_get_listening_queue(wp, &cur_lq, NULL)) {
cur_lq = 0;