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

improved mule and farm signal handling

Browse Source
This commit is contained in:
roberto@debian32
2011-10-26 06:30:42 +02:00
parent 83612649d5
commit fd03bdbe00
4 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/python/uwsgi_pymodule.c
+10 -5
View File
@@ -1234,7 +1234,7 @@ PyObject *py_uwsgi_mule_get_msg(PyObject * self, PyObject * args, PyObject *kwar
}
if (interesting_fd > -1) {
ssize_t len = read(interesting_fd, &uwsgi_signal, 1);
len = read(interesting_fd, &uwsgi_signal, 1);
if (len <= 0) {
uwsgi_log_verbose("uWSGI mule %d braying: my master died, i will follow him...\n", uwsgi.muleid);
end_me(0);
@@ -1245,17 +1245,22 @@ PyObject *py_uwsgi_mule_get_msg(PyObject * self, PyObject * args, PyObject *kwar
if (uwsgi_signal_handler(uwsgi_signal)) {
uwsgi_log_verbose("error managing signal %d on mule %d\n", uwsgi_signal, uwsgi.mywid);
}
goto clear;
}
}
}
UWSGI_GET_GIL;
if (len <= 0) {
if (len < 0) uwsgi_error("read()");
Py_INCREF(Py_None);
return Py_None;
if (len < 0) {
uwsgi_error("read()");
goto clear2;
}
return PyString_FromStringAndSize(message, len);
clear:
UWSGI_GET_GIL;
clear2:
Py_INCREF(Py_None);
return Py_None;
}
PyObject *py_uwsgi_farm_get_msg(PyObject * self, PyObject * args) {