@@ -497,7 +497,7 @@ private:
void shutdownServer() {
TRACE_POINT();
this_thread::disable_syscall_interruption dsi;
- int ret;
+ int ret, status;
time_t begin;
bool done = false;
@@ -516,21 +516,34 @@ private:
* Some Apache modules fork(), but don't close file descriptors.
* mod_wsgi is one such example. Because of that, closing serverSocket
* won't always cause the ApplicationPool server to exit. So we send it a
+ * signal. This must be the same as the oxt/system_calls.hpp interruption
* signal.
*/
syscalls::kill(serverPid, SIGINT);
- ret = syscalls::waitpid(serverPid, NULL, WNOHANG);
+ ret = syscalls::waitpid(serverPid, &status, WNOHANG);
done = ret > 0 || ret == -1;
if (!done) {
syscalls::usleep(100000);
}
}
if (done) {
- P_TRACE(2, "ApplicationPoolServerExecutable exited.");
+ if (ret > 0) {
+ if (WIFEXITED(status)) {
+ P_TRACE(2, "ApplicationPoolServerExecutable exited with exit status " <<
+ WEXITSTATUS(status) << ".");
+ } else if (WIFSIGNALED(status)) {
+ P_TRACE(2, "ApplicationPoolServerExecutable exited because of signal " <<
+ WTERMSIG(status) << ".");
+ } else {
+ P_TRACE(2, "ApplicationPoolServerExecutable exited for an unknown reason.");
+ }
+ } else {
+ P_TRACE(2, "ApplicationPoolServerExecutable exited.");
+ }
} else {
P_DEBUG("ApplicationPoolServerExecutable not exited in time. Killing it...");
- syscalls::kill(serverPid, SIGTERM);
+ syscalls::kill(serverPid, SIGKILL);
syscalls::waitpid(serverPid, NULL, 0);
}
ext/apache2/ApplicationPoolServer.h
@@ -196,29 +196,22 @@ private:
}
static void fatalSignalHandler(int signum) {
- static void (* const defaultHandler)(int) = SIG_DFL;
- static bool calledBefore = false;
+ char message[1024];
- if (calledBefore) {
- // If we're here then it means that this signal
- // handler crashed, and we weren't even able to
- // call write() or system()! Abort immediately:
- defaultHandler(signum);
- } else {
- calledBefore = true;
- write(STDERR_FILENO,
- "*** ERROR: ApplicationPoolServerExecutable received a "
- "fatal signal. Running gdb to obtain the backtrace:\n\n",
- sizeof("*** ERROR: ApplicationPoolServerExecutable received a "
- "fatal signal. Running gdb to obtain the backtrace:\n\n") - 1
- );
- write(STDERR_FILENO, "----------------- Begin gdb output -----------------\n",
- sizeof("----------------- Begin gdb output -----------------\n") - 1);
- system(gdbBacktraceGenerationCommandStr);
- write(STDERR_FILENO, "----------------- End gdb output -----------------\n",
- sizeof("----------------- End gdb output -----------------\n") - 1);
- defaultHandler(signum);
- }
+ snprintf(message, sizeof(message) - 1,
+ "*** ERROR: ApplicationPoolServerExecutable received fatal signal "
+ "%d. Running gdb to obtain the backtrace:\n\n",
+ signum);
+ message[sizeof(message) - 1] = '\0';
+ write(STDERR_FILENO, message, strlen(message));
+ write(STDERR_FILENO, "----------------- Begin gdb output -----------------\n",
+ sizeof("----------------- Begin gdb output -----------------\n") - 1);
+ system(gdbBacktraceGenerationCommandStr);
+ write(STDERR_FILENO, "----------------- End gdb output -----------------\n",
+ sizeof("----------------- End gdb output -----------------\n") - 1);
+
+ // Invoke default signal handler.
+ kill(getpid(), signum);
}
void setupSignalHandlers() {
@@ -251,12 +244,17 @@ private:
// Install the signal handlers.
action.sa_handler = fatalSignalHandler;
- action.sa_flags = 0;
+ action.sa_flags = SA_RESETHAND;
sigemptyset(&action.sa_mask);
- sigaction(SIGSEGV, &action, NULL);
+ sigaction(SIGQUIT, &action, NULL);
+ sigaction(SIGILL, &action, NULL);
sigaction(SIGABRT, &action, NULL);
- sigaction(SIGILL, &action, NULL);
- sigaction(SIGFPE, &action, NULL);
+ sigaction(SIGFPE, &action, NULL);
+ sigaction(SIGBUS, &action, NULL);
+ sigaction(SIGSEGV, &action, NULL);
+ sigaction(SIGALRM, &action, NULL);
+ sigaction(SIGUSR1, &action, NULL);
+ sigaction(SIGUSR2, &action, NULL);
}
}
@@ -274,6 +272,8 @@ public:
this->serverSocket = serverSocket;
this->statusReportFIFO = statusReportFIFO;
this->user = user;
+
+ P_TRACE(2, "ApplicationPoolServerExecutable initialized (PID " << getpid() << ")");
}
~Server() {
ext/apache2/ApplicationPoolServerExecutable.cpp
dabfdaf9c63911966d7e1f7f224bf71add82d1a9
Hongli Lai (Phusion)
hongli@phusion.nl
http://github.com/FooBarWidget/passenger/commit/63951b1897010de31062f5a487e0ae568ec4de89
63951b1897010de31062f5a487e0ae568ec4de89
2009-03-30T05:10:55-07:00
2009-03-30T05:10:55-07:00
Improve fatal error handling.
c78fe200f59ea6f81f7b99c4370eca101a5d1f89
Hongli Lai (Phusion)
hongli@phusion.nl