clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pull-request/1311' into PHP-7.0

Browse Source 
* pull-request/1311:
  fix inappropriate warning in FPM log
This commit is contained in:
Joe Watkins 2017-01-06 05:54:42 +00:00
commit 6a03b43e5f
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sapi/fpm/fpm/fpm_children.c
View File

@ -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) {
warned = 1;
zlog(ZLOG_WARNING, "The maximum number of processes has been reached. Please review your configuration and consider raising 'process.max'");
if (wp->running_children < 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 */