com php-src: Change pm.start_servers default warning to notice: sapi/fpm/fpm/fpm_conf.c
| From: | Remi Collet | Date: | Thu, 20 Nov 2014 07:16:20 +0000 |
| Subject: | com php-src: Change pm.start_servers default warning to notice: sapi/fpm/fpm/fpm_conf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83168@lists.php.net to get a copy of this message | ||
Commit: 5d66314ceae2e0bba54f6d0a91fabfcb22e3d8ad
Author: David Zuelke <dzuelke@gmail.com> Sat, 8 Nov 2014 20:18:58 -0500
Committer: Remi Collet <remi@php.net> Thu, 20 Nov 2014 08:16:20 +0100
Parents: 03815693ec22644c18e10d47d3c6ba1133be0ead
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5d66314ceae2e0bba54f6d0a91fabfcb22e3d8ad
Log:
Change pm.start_servers default warning to notice
Unlike other settings, this has a perfectly reasonable default, calculated using
a dynamic formula. If the default was hardcoded to "2" or something, then it
would make sense to have a warning, since that could potentially be bad, but for
a dynamically calculated value based on other mandatory settings, a notice ought
to be enough.
Changed paths:
M sapi/fpm/fpm/fpm_conf.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 18ddccb..fad5011 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -819,7 +819,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
if (config->pm_start_servers <= 0) {
config->pm_start_servers = config->pm_min_spare_servers +
((config->pm_max_spare_servers - config->pm_min_spare_servers) / 2);
- zlog(ZLOG_WARNING, "[pool %s] pm.start_servers is not set. It's been set to
%d.", wp->config->name, config->pm_start_servers);
+ zlog(ZLOG_NOTICE, "[pool %s] pm.start_servers is not set. It's been set to %d.",
wp->config->name, config->pm_start_servers);
} else if (config->pm_start_servers < config->pm_min_spare_servers ||
config->pm_start_servers > config->pm_max_spare_servers) {
zlog(ZLOG_ALERT, "[pool %s] pm.start_servers(%d) must not be less than
pm.min_spare_servers(%d) and not greater than pm.max_spare_servers(%d)",
wp->config->name, config->pm_start_servers, config->pm_min_spare_servers,
config->pm_max_spare_servers);