com php-src: Change pm.start_servers default warning to notice: sapi/fpm/fpm/fpm_conf.c

From: Date: Thu, 20 Nov 2014 07:11:43 +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-83162@lists.php.net to get a copy of this message
Commit: 909d44f20dd00ccf3a6519707bfaba2ed30e8b2b 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:11:43 +0100 Parents: 7e0ccb6d1217b6738117ab19590444fec9d0951a Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=909d44f20dd00ccf3a6519707bfaba2ed30e8b2b 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 34e0480..ce37b3c 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);

« previous php.cvs (#83162) next »