fat Sat, 19 Dec 2009 19:59:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292337
Log:
make error messages more consistent
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_process_ctl.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c
2009-12-19 19:57:58 UTC (rev 292336)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c
2009-12-19 19:59:10 UTC (rev 292337)
@@ -241,6 +241,9 @@
timersub(&tv1, &child->started, &tv2);
if (restart_child) {
+ if (!fpm_pctl_can_spawn_children()) {
+ severity = ZLOG_DEBUG;
+ }
zlog(ZLOG_STUFF, severity, "[pool %s] child %d
exited %s after %ld.%06d seconds from start", child->wp->config->name, (int)
pid, buf, tv2.tv_sec, (int) tv2.tv_usec);
} else {
zlog(ZLOG_STUFF, ZLOG_DEBUG, "[pool %s] child
%d has been killed by the process managment after %ld.%06d seconds from start",
child->wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_process_ctl.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_process_ctl.c
2009-12-19 19:57:58 UTC (rev 292336)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_process_ctl.c
2009-12-19 19:59:10 UTC (rev 292337)
@@ -157,7 +157,7 @@
for (child = wp->children; child; child = child->next) {
int res = kill(child->pid, signo);
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "[pool %s] sending signal
%d %s to child %d",
+ zlog(ZLOG_STUFF, ZLOG_DEBUG, "[pool %s] sending signal
%d %s to child %d",
child->wp->config->name, signo,
fpm_signal_names[signo] ?
fpm_signal_names[signo] : "", (int) child->pid);
@@ -168,7 +168,7 @@
}
if (alive_children) {
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "%d child(ren) still alive",
alive_children);
+ zlog(ZLOG_STUFF, ZLOG_DEBUG, "%d child(ren) still alive",
alive_children);
}
}
/* }}} */
@@ -223,7 +223,7 @@
if (new_state ==
FPM_PCTL_STATE_TERMINATING) break;
case FPM_PCTL_STATE_TERMINATING :
/* nothing can override 'terminating'
state */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "not
switching to '%s' state, because already in '%s' state",
+ zlog(ZLOG_STUFF, ZLOG_DEBUG, "not
switching to '%s' state, because already in '%s' state",
fpm_state_names[new_state],
fpm_state_names[fpm_state]);
return;
}
@@ -231,7 +231,7 @@
fpm_signal_sent = 0;
fpm_state = new_state;
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "switching to '%s'
state", fpm_state_names[fpm_state]);
+ zlog(ZLOG_STUFF, ZLOG_DEBUG, "switching to '%s' state",
fpm_state_names[fpm_state]);
/* fall down */
case FPM_PCTL_ACTION_TIMEOUT :
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
