set log_level always (patch by Jerome Loyet)

tony2001 · tony2001 · commit 2cce8d78b8d7 · 2009-12-14T09:51:14.000Z
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
@@ -41,6 +41,7 @@ int fpm_stdio_init_main() /* {{{ */
 
 int fpm_stdio_init_final() /* {{{ */
 {
+	zlog_set_level(fpm_globals.log_level);
 	if (fpm_global_config.daemonize) {
 		if (fpm_globals.error_log_fd != STDERR_FILENO) {
 			/* there might be messages to stderr from libevent, we need to log them all */
@@ -49,7 +50,6 @@ int fpm_stdio_init_final() /* {{{ */
 				return -1;
 			}
 		}
-		zlog_set_level(fpm_globals.log_level);
 		zlog_set_fd(fpm_globals.error_log_fd);
 	}
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ int fpm_stdio_init_main() /* {{{ */`
`41`	`41`
`42`	`42`	`int fpm_stdio_init_final() /* {{{ */`
`43`	`43`	`{`
	`44`	`+ zlog_set_level(fpm_globals.log_level);`
`44`	`45`	`if (fpm_global_config.daemonize) {`
`45`	`46`	`if (fpm_globals.error_log_fd != STDERR_FILENO) {`
`46`	`47`	`/* there might be messages to stderr from libevent, we need to log them all */`
`@@ -49,7 +50,6 @@ int fpm_stdio_init_final() /* {{{ */`
`49`	`50`	`return -1;`
`50`	`51`	`}`
`51`	`52`	`}`
`52`		`- zlog_set_level(fpm_globals.log_level);`
`53`	`53`	`zlog_set_fd(fpm_globals.error_log_fd);`
`54`	`54`	`}`
`55`	`55`	`return 0;`