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+

diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
index 68978ee75d18d8fa5576465d80b194ec11131454..c29e28f8867da002f2e9669cf256a7c5565ef926 100644 (file)
--- a/sapi/fpm/fpm/fpm_unix.c
+++ b/sapi/fpm/fpm/fpm_unix.c
@@ -266,6 +266,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;
 
@@ -396,7 +398,6 @@ int fpm_unix_init_main() /* {{{ */
                }
        }
 
-       zlog_set_level(fpm_globals.log_level);
        return 0;
 }
 /* }}} */