You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2012/09/24 13:58:52 UTC
svn commit: r1389316 - /httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Author: trawick
Date: Mon Sep 24 11:58:52 2012
New Revision: 1389316
URL: http://svn.apache.org/viewvc?rev=1389316&view=rev
Log:
WinNT MPM logging:
clarify when it is the child process event handle being logged
log the child process id in a few obvious places
Modified:
httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1389316&r1=1389315&r2=1389316&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Mon Sep 24 11:58:52 2012
@@ -821,7 +821,7 @@ static int master_main(server_rec *s, HA
}
if (SetEvent(child_exit_event) == 0) {
ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s, APLOGNO(00426)
- "Parent: SetEvent for child process %pp failed.",
+ "Parent: SetEvent for child process event %pp failed.",
event_handles[CHILD_HANDLE]);
}
/* Don't wait to verify that the child process really exits,
@@ -841,14 +841,16 @@ static int master_main(server_rec *s, HA
|| exitcode == APEXIT_CHILDINIT
|| exitcode == APEXIT_INIT) {
ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf, APLOGNO(00427)
- "Parent: child process exited with status %lu -- Aborting.", exitcode);
+ "Parent: child process %lu exited with status %lu -- Aborting.",
+ child_pid, exitcode);
shutdown_pending = 1;
}
else {
int i;
restart_pending = 1;
ap_log_error(APLOG_MARK, APLOG_NOTICE, APR_SUCCESS, ap_server_conf, APLOGNO(00428)
- "Parent: child process exited with status %lu -- Restarting.", exitcode);
+ "Parent: child process %lu exited with status %lu -- Restarting.",
+ child_pid, exitcode);
for (i = 0; i < ap_threads_per_child; i++) {
ap_update_child_status_from_indexes(0, i, SERVER_DEAD, NULL);
}
@@ -883,21 +885,21 @@ die_now:
/* Signal the child processes to exit */
if (SetEvent(child_exit_event) == 0) {
ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), ap_server_conf, APLOGNO(00429)
- "Parent: SetEvent for child process %pp failed",
+ "Parent: SetEvent for child process event %pp failed",
event_handles[CHILD_HANDLE]);
}
if (event_handles[CHILD_HANDLE]) {
rv = WaitForSingleObject(event_handles[CHILD_HANDLE], timeout);
if (rv == WAIT_OBJECT_0) {
ap_log_error(APLOG_MARK,APLOG_NOTICE, APR_SUCCESS, ap_server_conf, APLOGNO(00430)
- "Parent: Child process exited successfully.");
+ "Parent: Child process %lu exited successfully.", child_pid);
CloseHandle(event_handles[CHILD_HANDLE]);
event_handles[CHILD_HANDLE] = NULL;
}
else {
ap_log_error(APLOG_MARK,APLOG_NOTICE, APR_SUCCESS, ap_server_conf, APLOGNO(00431)
- "Parent: Forcing termination of child process %pp",
- event_handles[CHILD_HANDLE]);
+ "Parent: Forcing termination of child process %lu",
+ child_pid);
TerminateProcess(event_handles[CHILD_HANDLE], 1);
CloseHandle(event_handles[CHILD_HANDLE]);
event_handles[CHILD_HANDLE] = NULL;