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 ce37b3cfc837844e57da54b4ae1930acd3839c55..26a9fd1c7a59a5355e080399ecf94da2a18a633d 100644 (file)
--- 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 c29e28f8867da002f2e9669cf256a7c5565ef926..32448fc4d5dffa650aad506c6f4326e49708eb55 100644 (file)
--- 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;