]> granicus.if.org Git - php/commitdiff
- remove useless check
authorJérôme Loyet <fat@php.net>
Thu, 11 Nov 2010 12:56:44 +0000 (12:56 +0000)
committerJérôme Loyet <fat@php.net>
Thu, 11 Nov 2010 12:56:44 +0000 (12:56 +0000)
sapi/fpm/fpm/fpm_process_ctl.c

index 2a4011ee803b3f349a60c4b2ae2bf9566e3678e0..0c6a6cdf2ee1ec671fc178924e9f1256612ef7ef 100644 (file)
@@ -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;