diff options
| author | David Zuelke <dzuelke@gmail.com> | 2014-11-19 23:39:00 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-21 07:49:08 +0100 |
| commit | 9e8d4a1b064e1d9da0b52fe808890299f74e52bb (patch) | |
| tree | fbd8436cc37c2de314dec1fad0897e594b8f2c49 | |
| parent | 8beb1534601db46ead7b6c399de6a9131c744994 (diff) | |
| download | php-git-9e8d4a1b064e1d9da0b52fe808890299f74e52bb.tar.gz | |
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
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 1 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_unix.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 6e255354fc..908c7884a6 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1153,6 +1153,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 5dfdb4ab38..7ce2bcc6e6 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -231,8 +231,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; |