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

added --pyshell-oneshot

Browse Source
This commit is contained in:
roberto@oneiric64
2012-01-25 06:32:02 +01:00
parent 20856549c1
commit 6db3dab5ea
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/python/python_plugin.c
+11 -1
View File
@@ -55,6 +55,7 @@ struct option uwsgi_python_options[] = {
{"no-site", no_argument, &Py_NoSiteFlag, 1},
#endif
{"pyshell", no_argument, 0, LONG_ARGS_PYSHELL},
{"pyshell-oneshot", no_argument, 0, LONG_ARGS_PYSHELL_ONESHOT},
{"python", required_argument, 0, LONG_ARGS_PYTHON_RUN},
{"py", required_argument, 0, LONG_ARGS_PYTHON_RUN},
@@ -779,6 +780,11 @@ int uwsgi_python_manage_options(int i, char *optarg) {
uwsgi.honour_stdin = 1;
up.pyshell = 1;
return 1;
case LONG_ARGS_PYSHELL_ONESHOT:
uwsgi.honour_stdin = 1;
up.pyshell = 1;
up.pyshell_oneshot = 1;
return 1;
case LONG_ARGS_SHARED_PYIMPORT:
uwsgi_string_new_list(&up.shared_import_list, optarg);
return 1;
@@ -1484,8 +1490,12 @@ void uwsgi_python_hijack(void) {
// the pyshell will be execute only in the first worker
#ifndef UWSGI_PYPY
if (up.pyshell_oneshot && uwsgi.workers[uwsgi.mywid].hijacked_count > 0) {
uwsgi.workers[uwsgi.mywid].hijacked = 0;
return;
}
if (up.pyshell && uwsgi.mywid == 1) {
uwsgi.workers[uwsgi.mywid].hijacked = 1;
uwsgi.workers[uwsgi.mywid].hijacked_count++;
// re-map stdin to stdout and stderr if we are logging to a file
if (uwsgi.logfile) {
if (dup2(0, 1) < 0) {
plugins/python/uwsgi_python.h
+2
View File
@@ -22,6 +22,7 @@
#define LONG_ARGS_SPOOLER_PYIMPORT LONG_ARGS_PYTHON_BASE + 12
#define LONG_ARGS_PYTHON_RUN LONG_ARGS_PYTHON_BASE + 13
#define LONG_ARGS_SHARED_PYIMPORT LONG_ARGS_PYTHON_BASE + 14
#define LONG_ARGS_PYSHELL_ONESHOT LONG_ARGS_PYTHON_BASE + 15
#define PYTHON_APP_TYPE_WSGI 0
#define PYTHON_APP_TYPE_WEB3 1
@@ -131,6 +132,7 @@ struct uwsgi_python {
char *test_module;
int pyshell;
int pyshell_oneshot;
struct uwsgi_string_list *python_path;
struct uwsgi_string_list *import_list;