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

completetd first part of the new exceptions framework

Browse Source
This commit is contained in:
Unbit
2013-02-17 14:26:31 +01:00
parent b5a6da5448
commit f31186a0f9
14 changed files with 325 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/python/pyutils.c
+65 -61
View File
@@ -41,56 +41,80 @@ char *uwsgi_python_get_exception_type(PyObject *exc) {
return NULL;
}
char *uwsgi_python_get_exception_value(PyObject *value) {
return PyString_AsString( PyObject_Str(value) );
}
char *uwsgi_python_get_exception_repr(PyObject *exc, PyObject *value) {
char *exc_type = uwsgi_python_get_exception_type(exc);
char *exc_value = uwsgi_python_get_exception_value(value);
if (exc_type && exc_value) {
return uwsgi_concat3(exc_type, ": ", exc_value);
}
return NULL;
}
int uwsgi_python_manage_exceptions(void) {
struct uwsgi_buffer *uwsgi_python_backtrace(struct wsgi_request *wsgi_req) {
PyObject *type = NULL;
PyObject *value = NULL;
PyObject *traceback = NULL;
char *exc_type = NULL;
char *exc_value = NULL;
char *exc_repr = NULL;
PyObject *value = NULL;
PyObject *traceback = NULL;
struct uwsgi_buffer *ub = NULL;
PyErr_Fetch(&type, &value, &traceback);
PyErr_NormalizeException(&type, &value, &traceback);
PyErr_NormalizeException(&type, &value, &traceback);
if (uwsgi.reload_on_exception_type) {
exc_type = uwsgi_python_get_exception_type(type);
// traceback could not be available
if (!traceback) goto end;
PyObject *traceback_module = PyImport_ImportModule("traceback");
if (!traceback_module) {
goto end;
}
if (uwsgi.reload_on_exception_value) {
exc_value = uwsgi_python_get_exception_value(value);
PyObject *traceback_dict = PyModule_GetDict(traceback_module);
PyObject *extract_tb = PyDict_GetItemString(traceback_dict, "extract_tb");
if (!extract_tb) goto end;
PyObject *args = PyTuple_New(1);
Py_INCREF(traceback);
PyTuple_SetItem(args, 0, traceback);
PyObject *result = PyEval_CallObject(extract_tb, args);
Py_DECREF(args);
if (!result) goto end;
ub = uwsgi_buffer_new(4096);
Py_ssize_t i;
// we have to build a uwsgi array with 5 items (4 are taken from the python tb)
for(i=0;i< PyList_Size(result);i++) {
PyObject *t = PyList_GetItem(result, i);
PyObject *tb_filename = PyTuple_GetItem(t, 0);
PyObject *tb_lineno = PyTuple_GetItem(t, 1);
PyObject *tb_function = PyTuple_GetItem(t, 2);
PyObject *tb_text = PyTuple_GetItem(t, 3);
int64_t line_no = PyInt_AsLong(tb_lineno);
// filename
if (uwsgi_buffer_u16le(ub, PyString_Size(tb_filename))) goto end0;
if (uwsgi_buffer_append(ub, PyString_AsString(tb_filename), PyString_Size(tb_filename))) goto end0;
// lineno
if (uwsgi_buffer_append_valnum(ub, line_no)) goto end0;
// function
if (uwsgi_buffer_u16le(ub, PyString_Size(tb_function))) goto end0;
if (uwsgi_buffer_append(ub, PyString_AsString(tb_function), PyString_Size(tb_function))) goto end0;
// text
if (uwsgi_buffer_u16le(ub, PyString_Size(tb_text))) goto end0;
if (uwsgi_buffer_append(ub, PyString_AsString(tb_text), PyString_Size(tb_text))) goto end0;
// custom (unused)
if (uwsgi_buffer_u16le(ub, 0)) goto end0;
if (uwsgi_buffer_append(ub, "", 0)) goto end0;
}
if (uwsgi.reload_on_exception_repr) {
exc_repr = uwsgi_python_get_exception_repr(type, value);
}
Py_DECREF(result);
goto end;
int ret = uwsgi_manage_exception(exc_type, exc_value, exc_repr);
// free memory allocated for strcmp
if (exc_type) free(exc_type);
if (exc_repr) free(exc_repr);
PyErr_Restore(type, value, traceback);
return ret;
end0:
Py_DECREF(result);
uwsgi_buffer_destroy(ub);
ub = NULL;
end:
PyErr_Restore(type, value, traceback);
return ub;
}
struct uwsgi_buffer *uwsgi_python_exception_class(struct wsgi_request *wsgi_req) {
PyObject *type = NULL;
PyObject *value = NULL;
@@ -111,6 +135,7 @@ struct uwsgi_buffer *uwsgi_python_exception_class(struct wsgi_request *wsgi_req)
}
}
end:
free(class);
PyErr_Restore(type, value, traceback);
return ub;
}
@@ -183,28 +208,7 @@ PyObject *python_call(PyObject *callable, PyObject *args, int catch, struct wsgi
//uwsgi_log("called\n");
if (PyErr_Occurred()) {
int do_exit = uwsgi_python_manage_exceptions();
if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
uwsgi_log("Memory Error detected !!!\n");
}
// this can be in a spooler or in the master
if (uwsgi.mywid > 0) {
uwsgi.workers[uwsgi.mywid].exceptions++;
if (wsgi_req) {
uwsgi_apps[wsgi_req->app_id].exceptions++;
}
}
if (!catch) {
PyErr_Print();
}
if (do_exit) {
exit(UWSGI_EXCEPTION_CODE);
}
uwsgi_manage_exception(wsgi_req, catch);
}
#ifdef UWSGI_DEBUG