com php-src: move zlog_set_level() again: sapi/fp m/fpm/fpm_conf.c sapi/fpm/fpm/fpm_unix.c
| From: | Remi Collet | Date: | Thu, 20 Nov 2014 07:11:43 +0000 |
| Subject: | com php-src: move zlog_set_level() again: sapi/fp m/fpm/fpm_conf.c sapi/fpm/fpm/fpm_unix.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83163@lists.php.net to get a copy of this message | ||
Commit: befce20c84527181f760fb53e4d536f22e84953e
Author: David Zuelke <dzuelke@gmail.com> Wed, 19 Nov 2014 23:39:00 +0100
Committer: Remi Collet <remi@php.net> Thu, 20 Nov 2014 08:11:43 +0100
Parents: 909d44f20dd00ccf3a6519707bfaba2ed30e8b2b
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=befce20c84527181f760fb53e4d536f22e84953e
Log:
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
Bugs:
https://bugs.php.net/894
Changed paths:
M sapi/fpm/fpm/fpm_conf.c
M sapi/fpm/fpm/fpm_unix.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index ce37b3c..26a9fd1 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 c29e28f..32448fc 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;