avoid interleaving pywsgi threadstate

unbit · Aug 19, 2024 · a374e00 · a374e00
1 parent 52d858a
commit a374e00
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/plugins/pyuwsgi/pyuwsgi.c b/plugins/pyuwsgi/pyuwsgi.c
@@ -115,12 +115,6 @@ pyuwsgi_setup(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    //TODO: ...???
-    // actually do the thing!
-    PyThreadState *_tstate = PyThreadState_Get();
-    uwsgi_setup(orig_argc, orig_argv, environ);
-    PyThreadState_Swap(_tstate);
-
     Py_INCREF(self);
     return self;
 }
@@ -133,6 +127,7 @@ pyuwsgi_init(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
+    uwsgi_setup(orig_argc, orig_argv, environ);
     int rc = uwsgi_run();
 
     // never(?) here
@@ -149,6 +144,7 @@ pyuwsgi_run(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
+    uwsgi_setup(orig_argc, orig_argv, environ);
     int rc = uwsgi_run();
 
     // never(?) here