diff options
| author | Jérôme Loyet <fat@php.net> | 2009-12-19 19:59:10 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2009-12-19 19:59:10 +0000 |
| commit | 2d79ec186df2141ac2544182efd274579965a8f4 (patch) | |
| tree | 432552bcaaf918fdcfd6466849f4cf2a1abc0085 | |
| parent | 3cc15c11a0e50010c79932eeb3faf92519bd3da7 (diff) | |
| download | php-git-2d79ec186df2141ac2544182efd274579965a8f4.tar.gz | |
make error messages more consistent
| -rw-r--r-- | sapi/fpm/fpm/fpm_children.c | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_process_ctl.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c index 24d6f9c933..8b0c3539d7 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -241,6 +241,9 @@ void fpm_children_bury() /* {{{ */ 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); diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c index 8ce35d17e9..c37e394a56 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.c +++ b/sapi/fpm/fpm/fpm_process_ctl.c @@ -157,7 +157,7 @@ static void fpm_pctl_kill_all(int signo) /* {{{ */ 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 @@ static void fpm_pctl_kill_all(int signo) /* {{{ */ } 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 @@ void fpm_pctl(int new_state, int action) /* {{{ */ 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 @@ void fpm_pctl(int new_state, int action) /* {{{ */ 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 : |