From: David Zuelke <dzuelke@gmail.com>
Date: Sat, 8 Nov 2014 22:22:54 +0000 (-0500)
Subject: Fixed bug #68381 Set FPM log level earlier during init
X-Git-Tag: php-5.6.4RC1~55^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a43410871c76f9b3e712295ff49fa1f832ab17e;p=php

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 68978ee75d..c29e28f886 100644
--- 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;
 }
 /* }}} */