Fixes #12 Using libpyfcgi.IoOut for stdout & stderr PEP333 workers

libpyfcgi.IoOut can be use for stdout & stderr for alternate workers too

include/python_pyfcgi.h

@@ -63,7 +63,9 @@ struct libpyfcgi_context_s
 	 * @ingroup libpyfcgi */
 	PyObject *headers;
 	/**@brief libpyfcgi.IoIn instance */
-	IoIn *ioin;
+	PyIO_t *ioin;
+	/**@brief libpyfcgi.IoOut instances for stdout & stderr */
+	PyIO_t *stdio[2];
 	/**@brief Indicate if headers was sent in a PEP333 application
 	 * @ingroup libpyfcgi */
 	short headers_sent;
@@ -157,4 +159,7 @@ PyObject* pyfcgi_start_response(PyObject*, PyObject**, Py_ssize_t);
  */
 PyObject* pyfcgi_write_body(PyObject*, PyObject**, Py_ssize_t);
 
+int _libpyfcgi_stdout_write(const char*, size_t);
+int _libpyfcgi_stderr_write(const char*, size_t);
+
 #endif

include/pyutils.h

@@ -72,6 +72,8 @@ PyObject* update_pyenv(PyObject*, char**);
  * from PyFCGI_conf.py_entrymod & PyFCGI_conf.py_entryfun */
 PyObject* import_entrypoint();
 
+/**@brief Init and return libpyfcgi */
+PyObject* pyinit_libpyfcgi();
 /**@brief Return the start_response() python function for pep333 worker */
 PyObject* get_start_response();
 

src/python_pyfcgi.c

@@ -21,7 +21,7 @@
 
 /* Globals definitions */
 /* libpyfcgi context */
-libpyfcgi_context_t libpyfcgi = { NULL, NULL, NULL, NULL, 0, NULL, NULL, 0 };
+libpyfcgi_context_t libpyfcgi = { NULL, NULL, NULL, NULL, {NULL, NULL}, 0, NULL, NULL, 0 };
 /* Python module methods specs */
 /**@todo Add doc in last field */
 PyMethodDef pyfcgimodule_methods[] = {
@@ -308,6 +308,12 @@ PyInit_libpyfcgi(void)
 	{
 		return NULL;
 	}
+	// init IoOut type
+	IoOutType.tp_new = PyType_GenericNew;
+	if(PyType_Ready(&IoOutType) < 0)
+	{
+		return NULL;
+	}
 
 	// init module & globals
 	libpyfcgi.status = NULL;
@@ -316,19 +322,28 @@ PyInit_libpyfcgi(void)
 	libpyfcgi.self = PyModule_Create(&pyfcgimodule);
 	if(libpyfcgi.self == NULL) { return NULL; }
 
-	// Add type to module (optionnal)
+	// Add type to module
 	PyModule_AddObject(libpyfcgi.self, "IoIn", (PyObject*)&IoInType);
+	PyModule_AddObject(libpyfcgi.self, "IoOut", (PyObject*)&IoOutType);
 
 	// Create a new instance of IoIn
-	libpyfcgi.ioin = (IoIn*)PyObject_CallObject((PyObject*)&IoInType, NULL);
+	libpyfcgi.ioin = (PyIO_t*)PyObject_CallObject((PyObject*)&IoInType, NULL);
 	Py_INCREF(libpyfcgi.ioin);
 	if(!libpyfcgi.ioin)
 	{
 		return NULL;
 	}
-	libpyfcgi.ioin->in_stream = &libpyfcgi.in; // point on stream pointer
+	libpyfcgi.ioin->io_stream = &libpyfcgi.in; // point on stream pointer
 	libpyfcgi.ioin->bin = 1; // binary stream (bytes for python)
 
+	// Add stdout & stderr
+pyfcgi_log(LOG_DEBUG, "libpyfcgi INIT0");
+	libpyfcgi.stdio[0] = (PyIO_t*)PyObject_CallObject((PyObject*)&IoOutType, NULL);
+pyfcgi_log(LOG_DEBUG, "libpyfcgi INIT1");
+	libpyfcgi.stdio[0]->write = _libpyfcgi_stdout_write;
+	libpyfcgi.stdio[1] = (PyIO_t*)PyObject_CallObject((PyObject*)&IoOutType, NULL);
+	libpyfcgi.stdio[1]->write = _libpyfcgi_stderr_write;
+
 	// Add it to wsgi dict
 	if(PyDict_SetItemString(PyFCGI_conf.context.wsgi_dict, "wsgi.input",
 		(PyObject*)libpyfcgi.ioin))
@@ -542,3 +557,13 @@ void libpyfcgi_timeout()
 	}
 }
 
+int _libpyfcgi_stdout_write(const char* buff, size_t sz)
+{
+	pyfcgi_log(LOG_INFO, "stdout : '%s'", buff);
+	return 1;
+}
+int _libpyfcgi_stderr_write(const char* buff, size_t sz)
+{
+	pyfcgi_log(LOG_ERR, "stderr : '%s'", buff);
+	return 1;
+}

src/pyutils.c

@@ -434,19 +434,36 @@ PyObject* import_entrypoint()
 	return entry_fun;
 }
 
-PyObject* get_start_response()
+PyObject* pyinit_libpyfcgi()
 {
 	PyObject *module;
-	if(!libpyfcgi.self)
+	if(libpyfcgi.self) { return libpyfcgi.self; }
+
+	module = PyInit_libpyfcgi();
+	if(module == NULL)
 	{
-		module = PyInit_libpyfcgi();
-		if(module == NULL)
-		{
-			pyfcgi_log(LOG_ERR, "Unable to create libpyfcgi python module");
-			return NULL;
-		}
-		libpyfcgi.self = module;
+		pyfcgi_log(LOG_ERR, "Unable to create libpyfcgi python module");
+		return NULL;
+	}
+	libpyfcgi.self = module;
+	if(PySys_SetObject("stdout", (PyObject*)libpyfcgi.stdio[0]))
+	{
+		pyfcgi_log(LOG_ERR, "Unable to set sys.stdout");
+		log_expt(LOG_ALERT);
+		return NULL;
 	}
+	if(PySys_SetObject("stderr", (PyObject*)libpyfcgi.stdio[1]))
+	{
+		pyfcgi_log(LOG_ERR, "Unable to set sys.stderr");
+		log_expt(LOG_ALERT);
+		return NULL;
+	}
+	return module;
+}
+
+PyObject* get_start_response()
+{
+	pyinit_libpyfcgi();
 	return PyObject_GetAttrString(libpyfcgi.self, "start_response");
 }
 

src/pyworker.c

@@ -39,11 +39,11 @@ static int worker_piper_sigrcv = 0;
 
 int work333(int wrk_id)
 {
-	PyObject *entry_fun, *pyflush[2], *py_osmod, *entry_ret, *environ,
+	PyObject *entry_fun, *py_osmod, *entry_ret, *environ,
 		*start_response, *args;
 	FCGX_Stream *in_stream, *out_stream, *err_stream;
 	char **envp;
-	int count, pipe_out[2], pipe_err[2];
+	int count;
 	int max_reqs;
 	struct timeval start, stop;
 	FCGX_Request *request;
@@ -54,11 +54,17 @@ int work333(int wrk_id)
 
 	pyinit();
 	pyfcgi_log(LOG_DEBUG, "Python started");
-	update_python_fd(pipe_out, pipe_err);
-	fetch_pyflush(&(pyflush[0]), &(pyflush[1]));
-
 	//importing os
 	py_osmod = python_osmod();
+	pyfcgi_log(LOG_DEBUG, "Python OSMOD");
+	//importing libpyfcgi
+	if(!pyinit_libpyfcgi())
+	{
+		exit(PYFCGI_FATAL);
+	}
+	pyfcgi_log(LOG_DEBUG, "libpyfcgi imported");
+
+
 	// loading module
 	entry_fun = import_entrypoint();
 
@@ -146,8 +152,6 @@ int work333(int wrk_id)
 		// clean stuffs
 		Py_DECREF(args);
 		Py_DECREF(environ);
-		// flush & logs pystdout & pystderr
-		worker_log_pipes(pipe_out[0], pipe_err[0], pyflush);
 
 		FCGX_FClose(out_stream);
 		FCGX_FClose(in_stream);