mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'pull-request/1311' into PHP-7.0
* pull-request/1311: fix inappropriate warning in FPM log
This commit is contained in:
commit
6a03b43e5f
@ -424,8 +424,10 @@ int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop, int nb_to
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!warned && fpm_global_config.process_max > 0 && fpm_globals.running_children >= fpm_global_config.process_max) {
|
if (!warned && fpm_global_config.process_max > 0 && fpm_globals.running_children >= fpm_global_config.process_max) {
|
||||||
warned = 1;
|
if (wp->running_children < max) {
|
||||||
zlog(ZLOG_WARNING, "The maximum number of processes has been reached. Please review your configuration and consider raising 'process.max'");
|
warned = 1;
|
||||||
|
zlog(ZLOG_WARNING, "The maximum number of processes has been reached. Please review your configuration and consider raising 'process.max'");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1; /* we are done */
|
return 1; /* we are done */
|
||||||
|
Loading…
Reference in New Issue
Block a user