com php-src: Fixed bug #68381 Set FPM log level earlier during init: sapi/fpm/fpm/fpm_unix.c

From: Date: Tue, 18 Nov 2014 16:42:21 +0000
Subject: com php-src: Fixed bug #68381 Set FPM log level earlier during init: sapi/fpm/fpm/fpm_unix.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83143@lists.php.net to get a copy of this message
Commit: 03cf70ab1e35305443ac379ee5219d19aeeb6ba2 Author: David Zuelke <dzuelke@gmail.com> Sat, 8 Nov 2014 17:22:54 -0500 Committer: Remi Collet <remi@php.net> Tue, 18 Nov 2014 17:42:21 +0100 Parents: 09f9f7ce5030973052bca5043425bd9f20ad7a7e Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03cf70ab1e35305443ac379ee5219d19aeeb6ba2 Log: Fixed bug #68381 Set FPM log level earlier during init The log level will be ignored throughout log events in fpm_unix_init_main, until the very end when zlog_set_level is finally called. In particular, fpm_unix_conf_wp may throw notices like this: > [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when… Which will still appear even if log_level in php-fpm.conf is set to warning+ Bugs: https://bugs.php.net/68381 Changed paths: M sapi/fpm/fpm/fpm_unix.c Diff: diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index ea0e673..5dfdb4a 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -231,6 +231,8 @@ int fpm_unix_init_main() /* {{{ */ struct fpm_worker_pool_s *wp; int is_root = !geteuid(); + zlog_set_level(fpm_globals.log_level); + if (fpm_global_config.rlimit_files) { struct rlimit r; @@ -361,7 +363,6 @@ int fpm_unix_init_main() /* {{{ */ } } - zlog_set_level(fpm_globals.log_level); return 0; } /* }}} */

« previous php.cvs (#83143) next »