the decoratortest is fully working, ready for release

This commit is contained in:
roberto@dexter
2011-08-29 09:54:07 +02:00
parent b428bd3b87
commit 97133b27ce
6 changed files with 80 additions and 11 deletions
+20
View File
@@ -29,6 +29,9 @@ PyObject *py_uwsgi_signal_wait(PyObject * self, PyObject * args) {
}
else {
#endif
UWSGI_RELEASE_GIL;
pfd[0].fd = uwsgi.signal_socket;
pfd[0].events = POLLIN;
pfd[1].fd = uwsgi.my_signal_socket;
@@ -55,6 +58,7 @@ cycle:
uwsgi_error("read()");
}
else {
if (uwsgi_signal_handler(received_signal)) {
uwsgi_log_verbose("error managing signal %d on worker %d\n", received_signal, uwsgi.mywid);
}
@@ -64,8 +68,11 @@ cycle:
}
}
}
}
UWSGI_GET_GIL;
#ifdef UWSGI_ASYNC
}
#endif
@@ -961,6 +968,18 @@ PyObject *py_uwsgi_log(PyObject * self, PyObject * args) {
return Py_True;
}
PyObject *py_uwsgi_i_am_the_spooler(PyObject * self, PyObject * args) {
#ifdef UWSGI_SPOOLER
if (uwsgi.mypid == uwsgi.shared->spooler_pid) {
Py_INCREF(Py_True);
return Py_True;
}
#endif
Py_INCREF(Py_None);
return Py_None;
}
PyObject *py_uwsgi_lock(PyObject * self, PyObject * args) {
// the spooler cannot lock resources
@@ -2684,6 +2703,7 @@ static PyMethodDef uwsgi_advanced_methods[] = {
{"recv_block", py_uwsgi_recv_block, METH_VARARGS, ""},
{"recv_frame", py_uwsgi_recv_frame, METH_VARARGS, ""},
{"close", py_uwsgi_close, METH_VARARGS, ""},
{"i_am_the_spooler", py_uwsgi_i_am_the_spooler, METH_VARARGS, ""},
{"fcgi", py_uwsgi_fcgi, METH_VARARGS, ""},