com php-src: - Fixed bug #62947 (Unneccesary warnings on FPM): NEWS sapi/fpm/fpm/fpm_unix.c
| From: | Jérôme Loyet | Date: | Thu, 27 Sep 2012 23:08:48 +0000 |
| Subject: | com php-src: - Fixed bug #62947 (Unneccesary warnings on FPM): NEWS sapi/fpm/fpm/fpm_unix.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70255@lists.php.net to get a copy of this message | ||
Commit: 72f3457161aaf8c6bd0980aff855beca20d63404
Author: Jerome Loyet <fat@php.net> Fri, 28 Sep 2012 01:08:48 +0200
Parents: 64a0e7cdc2a90a13dd238068a7ff3d357de284b4
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=72f3457161aaf8c6bd0980aff855beca20d63404
Log:
- Fixed bug #62947 (Unneccesary warnings on FPM)
Bugs:
https://bugs.php.net/62947
Changed paths:
M NEWS
M sapi/fpm/fpm/fpm_unix.c
Diff:
diff --git a/NEWS b/NEWS
index 65ccc9a..199a2fb 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ PHP NEWS
. Fixed bug #62954 (startup problems fpm / php-fpm). (fat)
. Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)
. Fixed bug #63085 (Systemd integration and daemonize). (remi, fat)
+ . Fixed bug #62947 (Unneccesary warnings on FPM). (fat)
- OpenSSL:
.. Implemented FR #61421 (OpenSSL signature verification missing RMD160,
diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
index 1a75944..48249e8 100644
--- a/sapi/fpm/fpm/fpm_unix.c
+++ b/sapi/fpm/fpm/fpm_unix.c
@@ -121,16 +121,16 @@ static int fpm_unix_conf_wp(struct fpm_worker_pool_s *wp) /* {{{ */
}
} else { /* not root */
if (wp->config->user && *wp->config->user) {
- zlog(ZLOG_WARNING, "[pool %s] 'user' directive is ignored when FPM is not running
as root", wp->config->name);
+ zlog(ZLOG_NOTICE, "[pool %s] 'user' directive is ignored when FPM is not running
as root", wp->config->name);
}
if (wp->config->group && *wp->config->group) {
- zlog(ZLOG_WARNING, "[pool %s] 'group' directive is ignored when FPM is not
running as root", wp->config->name);
+ zlog(ZLOG_NOTICE, "[pool %s] 'group' directive is ignored when FPM is not running
as root", wp->config->name);
}
if (wp->config->chroot && *wp->config->chroot) {
- zlog(ZLOG_WARNING, "[pool %s] 'chroot' directive is ignored when FPM is not
running as root", wp->config->name);
+ zlog(ZLOG_NOTICE, "[pool %s] 'chroot' directive is ignored when FPM is not
running as root", wp->config->name);
}
if (wp->config->process_priority != 64) {
- zlog(ZLOG_WARNING, "[pool %s] 'process.priority' directive is ignored when FPM is
not running as root", wp->config->name);
+ zlog(ZLOG_NOTICE, "[pool %s] 'process.priority' directive is ignored when FPM is
not running as root", wp->config->name);
}
/* set up HOME and USER anyway */
@@ -350,7 +350,7 @@ int fpm_unix_init_main() /* {{{ */
return -1;
}
} else {
- zlog(ZLOG_WARNING, "'process.priority' directive is ignored when FPM is not
running as root");
+ zlog(ZLOG_NOTICE, "'process.priority' directive is ignored when FPM is not
running as root");
}
}