From: David Zuelke <dzuelke@gmail.com>
Date: Wed, 19 Nov 2014 22:39:00 +0000 (+0100)
Subject: move zlog_set_level() again
X-Git-Tag: php-5.6.4RC1~55^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=befce20c84527181f760fb53e4d536f22e84953e;p=php

move zlog_set_level() again

from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894),
because otherwise nothing in fpm_conf_init_main() obeys log levels
---

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index ce37b3cfc8..26a9fd1c7a 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -1159,6 +1159,7 @@ static int fpm_conf_post_process(int force_daemon TSRMLS_DC) /* {{{ */
 	}
 
 	fpm_globals.log_level = fpm_global_config.log_level;
+	zlog_set_level(fpm_globals.log_level);
 
 	if (fpm_global_config.process_max < 0) {
 		zlog(ZLOG_ERROR, "process_max can't be negative");
diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
index c29e28f886..32448fc4d5 100644
--- a/sapi/fpm/fpm/fpm_unix.c
+++ b/sapi/fpm/fpm/fpm_unix.c
@@ -266,8 +266,6 @@ 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;