technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Python: fixed error reporting on initialization of applications.

Browse Source 
PyErr_Print() writes traceback to "sys.stderr", which is a file object that
can buffer the output.  If the process exits immediately, the buffer can be
destroyed before flushing to the log.  As a result, the user doesn't see
the traceback.

Now Py_Finalize() is also called in case of any errors during initialization.
It finalizes the interpreter and flushes all data.
This commit is contained in:
Valentin Bartenev
2018-12-20 15:47:10 +03:00
parent 1ce7e860b2
commit 27394118b3
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nxt_python_wsgi.c
View File

@@ -339,7 +339,7 @@ nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
goto fail; goto fail;
} }
Py_DECREF(obj); Py_CLEAR(obj);
nxt_py_module = nxt_alloca(c->module.length + 1); nxt_py_module = nxt_alloca(c->module.length + 1);
nxt_memcpy(nxt_py_module, c->module.start, c->module.length); nxt_memcpy(nxt_py_module, c->module.start, c->module.length);
@@ -349,7 +349,7 @@ nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
if (nxt_slow_path(module == NULL)) { if (nxt_slow_path(module == NULL)) {
nxt_alert(task, "Python failed to import module \"%s\"", nxt_py_module); nxt_alert(task, "Python failed to import module \"%s\"", nxt_py_module);
PyErr_Print(); PyErr_Print();
return NXT_ERROR; goto fail;
} }
obj = PyDict_GetItemString(PyModule_GetDict(module), "application"); obj = PyDict_GetItemString(PyModule_GetDict(module), "application");
@@ -367,9 +367,10 @@ nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
} }
Py_INCREF(obj); Py_INCREF(obj);
Py_DECREF(module); Py_CLEAR(module);
nxt_py_application = obj; nxt_py_application = obj;
obj = NULL;
nxt_unit_default_init(task, &python_init); nxt_unit_default_init(task, &python_init);
@@ -377,7 +378,7 @@ nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
unit_ctx = nxt_unit_init(&python_init); unit_ctx = nxt_unit_init(&python_init);
if (nxt_slow_path(unit_ctx == NULL)) { if (nxt_slow_path(unit_ctx == NULL)) {
return NXT_ERROR; goto fail;
} }
rc = nxt_unit_run(unit_ctx); rc = nxt_unit_run(unit_ctx);
@@ -395,9 +396,7 @@ fail:
Py_XDECREF(obj); Py_XDECREF(obj);
Py_XDECREF(module); Py_XDECREF(module);
if (nxt_py_home != NULL) { nxt_python_atexit();
nxt_free(nxt_py_home);
}
return NXT_ERROR; return NXT_ERROR;
} }
@@ -529,10 +528,10 @@ fail:
static void static void
nxt_python_atexit(void) nxt_python_atexit(void)
{ {
Py_DECREF(nxt_py_application); Py_XDECREF(nxt_py_application);
Py_DECREF(nxt_py_start_resp_obj); Py_XDECREF(nxt_py_start_resp_obj);
Py_DECREF(nxt_py_write_obj); Py_XDECREF(nxt_py_write_obj);
Py_DECREF(nxt_py_environ_ptyp); Py_XDECREF(nxt_py_environ_ptyp);
Py_Finalize(); Py_Finalize();