clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-10-04 16:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

better emperor+master mode

Browse Source
This commit is contained in:
roberto@dj1
2011-05-27 05:11:41 -05:00
parent 4818efa7de
commit ce23fd38ab
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uwsgi.c
+11 -1
View File
@@ -417,6 +417,11 @@ void kill_them_all(int signum) {
#endif
if (uwsgi.emperor_pid >= 0) {
kill(uwsgi.emperor_pid, SIGKILL);
uwsgi_log( "killed the emperor with pid %d\n", uwsgi.emperor_pid);
}
for (i = 0; i < uwsgi.shared->daemons_cnt; i++) {
if (uwsgi.shared->daemons[i].pid > 0)
@@ -446,6 +451,10 @@ void grace_them_all(int signum) {
}
#endif
if (uwsgi.emperor_pid >= 0) {
kill(uwsgi.emperor_pid, SIGKILL);
uwsgi_log( "killed the emperor with pid %d\n", uwsgi.emperor_pid);
}
for (i = 0; i < uwsgi.shared->daemons_cnt; i++) {
if (uwsgi.shared->daemons[i].pid > 0)
@@ -742,6 +751,7 @@ int main(int argc, char *argv[], char *envp[]) {
uwsgi.signal_socket = -1;
uwsgi.emperor_fd_config = -1;
uwsgi.emperor_pid = -1;
uwsgi.cluster_fd = -1;
uwsgi.cores = 1;
@@ -1342,7 +1352,7 @@ int uwsgi_start(void *v_argv) {
uwsgi_error("pid()");
exit(1);
}
else if (uwsgi.emperor_pid > 0) {
else if (uwsgi.emperor_pid == 0) {
emperor_loop();
// never here
exit(1);