fixed a spooler signal bug spotted by Gabriele Giaccari

This commit is contained in:
roberto@debian32
2011-10-14 18:32:17 +02:00
parent 893bf3686b
commit 19c5bfb42c
2 changed files with 4 additions and 5 deletions
+4 -2
View File
@@ -52,8 +52,10 @@ void uwsgi_fixup_fds(int wid, int muleid) {
}
}
#ifdef UWSGI_SPOOLER
if (uwsgi.shared->spooler_signal_pipe[0] != -1) close (uwsgi.shared->spooler_signal_pipe[0]);
if (uwsgi.shared->spooler_signal_pipe[1] != -1) close (uwsgi.shared->spooler_signal_pipe[1]);
if (uwsgi.shared->spooler_pid != getpid()) {
if (uwsgi.shared->spooler_signal_pipe[0] != -1) close (uwsgi.shared->spooler_signal_pipe[0]);
if (uwsgi.shared->spooler_signal_pipe[1] != -1) close (uwsgi.shared->spooler_signal_pipe[1]);
}
#endif
if (uwsgi.shared->mule_signal_pipe[0] != -1) close(uwsgi.shared->mule_signal_pipe[0]);
-3
View File
@@ -55,9 +55,6 @@ pid_t spooler_start() {
spooler();
}
else if (pid > 0) {
if (uwsgi.master_process) {
close(uwsgi.shared->spooler_signal_pipe[1]);
}
uwsgi_log("spawned the uWSGI spooler on dir %s with pid %d\n", uwsgi.spool_dir, pid);
}