Introducing application 'atexit' hook.

Finalizing Python interpreter.

This closes #65 issue on GitHub.
This commit is contained in:
Max Romanov
2017-12-27 14:02:11 +03:00
parent cdfdbc43eb
commit be36cf52c8
7 changed files with 36 additions and 5 deletions

View File

@@ -382,7 +382,18 @@ nxt_app_http_init(nxt_task_t *task, nxt_runtime_t *rt)
void void
nxt_port_app_data_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) nxt_app_quit_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg)
{
if (nxt_app->atexit != NULL) {
nxt_app->atexit(task);
}
nxt_worker_process_quit_handler(task, msg);
}
void
nxt_app_data_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg)
{ {
size_t dump_size; size_t dump_size;
nxt_buf_t *b; nxt_buf_t *b;

View File

@@ -218,6 +218,7 @@ struct nxt_app_module_s {
nxt_int_t (*run)(nxt_task_t *task, nxt_int_t (*run)(nxt_task_t *task,
nxt_app_rmsg_t *rmsg, nxt_app_rmsg_t *rmsg,
nxt_app_wmsg_t *wmsg); nxt_app_wmsg_t *wmsg);
void (*atexit)(nxt_task_t *task);
}; };

View File

@@ -20,6 +20,7 @@ nxt_application_module_t nxt_go_module = {
nxt_string("go"), nxt_string("go"),
nxt_go_init, nxt_go_init,
nxt_go_run, nxt_go_run,
NULL,
}; };

View File

@@ -179,6 +179,7 @@ NXT_EXPORT nxt_application_module_t nxt_app_module = {
nxt_string(PHP_VERSION), nxt_string(PHP_VERSION),
nxt_php_init, nxt_php_init,
nxt_php_run, nxt_php_run,
NULL,
}; };

View File

@@ -60,9 +60,9 @@ typedef struct {
typedef struct nxt_python_run_ctx_s nxt_python_run_ctx_t; typedef struct nxt_python_run_ctx_s nxt_python_run_ctx_t;
static nxt_int_t nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf); static nxt_int_t nxt_python_init(nxt_task_t *task, nxt_common_app_conf_t *conf);
static nxt_int_t nxt_python_run(nxt_task_t *task, static nxt_int_t nxt_python_run(nxt_task_t *task,
nxt_app_rmsg_t *rmsg, nxt_app_wmsg_t *msg); nxt_app_rmsg_t *rmsg, nxt_app_wmsg_t *msg);
static void nxt_python_atexit(nxt_task_t *task);
static PyObject *nxt_python_create_environ(nxt_task_t *task); static PyObject *nxt_python_create_environ(nxt_task_t *task);
static PyObject *nxt_python_get_environ(nxt_task_t *task, static PyObject *nxt_python_get_environ(nxt_task_t *task,
@@ -103,6 +103,7 @@ NXT_EXPORT nxt_application_module_t nxt_app_module = {
nxt_string(PY_VERSION), nxt_string(PY_VERSION),
nxt_python_init, nxt_python_init,
nxt_python_run, nxt_python_run,
nxt_python_atexit,
}; };
@@ -455,6 +456,21 @@ fail:
} }
static void
nxt_python_atexit(nxt_task_t *task)
{
Py_DECREF(nxt_py_application);
Py_DECREF(nxt_py_start_resp_obj);
Py_DECREF(nxt_py_environ_ptyp);
Py_Finalize();
if (nxt_py_home != NULL) {
nxt_free(nxt_py_home);
}
}
static PyObject * static PyObject *
nxt_python_create_environ(nxt_task_t *task) nxt_python_create_environ(nxt_task_t *task)
{ {

View File

@@ -148,7 +148,8 @@ void nxt_cdecl nxt_log_time_handler(nxt_uint_t level, nxt_log_t *log,
void nxt_stream_connection_init(nxt_task_t *task, void *obj, void *data); void nxt_stream_connection_init(nxt_task_t *task, void *obj, void *data);
void nxt_port_app_data_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg); void nxt_app_quit_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg);
void nxt_app_data_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg);
#define nxt_runtime_process_each(rt, process) \ #define nxt_runtime_process_each(rt, process) \

View File

@@ -21,11 +21,11 @@ static void nxt_worker_process_sigquit_handler(nxt_task_t *task, void *obj,
nxt_port_handlers_t nxt_app_process_port_handlers = { nxt_port_handlers_t nxt_app_process_port_handlers = {
.quit = nxt_worker_process_quit_handler, .quit = nxt_app_quit_handler,
.new_port = nxt_port_new_port_handler, .new_port = nxt_port_new_port_handler,
.change_file = nxt_port_change_log_file_handler, .change_file = nxt_port_change_log_file_handler,
.mmap = nxt_port_mmap_handler, .mmap = nxt_port_mmap_handler,
.data = nxt_port_app_data_handler, .data = nxt_app_data_handler,
.remove_pid = nxt_port_remove_pid_handler, .remove_pid = nxt_port_remove_pid_handler,
}; };