php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 04:32:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

move zlog_set_level() again

Browse Source 
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
This commit is contained in:
David Zuelke
2014-11-19 23:39:00 +01:00
committed by Remi Collet
parent 909d44f20d
commit befce20c84
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sapi/fpm/fpm/fpm_conf.c
View File

@@ -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");

2
sapi/fpm/fpm/fpm_unix.c
View File

@@ -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;