Add sys.stdout & sys.stderr logging for pep333 worker

include/pyworker.h

@@ -150,6 +150,14 @@ int worker_piper(void*);
  */
 void worker_piper_sighandler(int);
 
+/**@brief empty pipes and log content for pep333 workers
+ * @todo enhance logging : 1 lines per logline + line counter ?
+ * @param int pipes for stdout
+ * @param int pipes for stderr
+ * @param PyObject[2] python flush methods
+ */
+void worker_log_pipes(int, int, PyObject*[2]);
+
 /**@brief Attempt to read the request size from ctl pipe
  * @param int ctl pipe read fd
  * @param size_t* rep_sz

src/pyworker.c

@@ -92,6 +92,7 @@ int work333(int wrk_id, int semid)
 		libpyfcgi.out = out_stream;
 		libpyfcgi.in = in_stream;
 		args = Py_BuildValue("OO", environ, start_response);
+		// Call application function
 		entry_ret = PyObject_CallObject(entry_fun, args);
 		if(entry_ret && entry_ret != Py_None )
 		{
@@ -119,8 +120,7 @@ int work333(int wrk_id, int semid)
 		Py_DECREF(args);
 		Py_DECREF(environ);
 		// flush & logs pystdout & pystderr
-		PyObject_CallObject(pyflush[0], NULL);
-		PyObject_CallObject(pyflush[1], NULL);
+		worker_log_pipes(pipe_out[0], pipe_err[0], pyflush);
 
 		FCGX_FClose(out_stream);
 		FCGX_FClose(in_stream);
@@ -483,6 +483,54 @@ int worker_piper(void *ptr)
 	return 0;
 }
 
+void worker_log_pipes(int pipe_std, int pipe_err, PyObject *flush[2])
+{
+	size_t ret;
+	char buff[4096];
+	int i, poll_ret;
+	int loglevels[2] = {LOG_INFO, LOG_WARNING};
+	struct pollfd fds[2];
+	short isflush[2] = {0,0};
+	char *outnames[2] = {"sys.stdout", "sys.stderr"};
+
+	fds[0].fd = pipe_std;
+	fds[1].fd = pipe_err;
+	fds[0].events = fds[1].events = POLLIN;
+	fds[0].revents = fds[1].revents = 0;
+
+	for(i=0; i<2; i++)
+	{
+		do
+		{
+			poll_ret = poll(&(fds[i]), 1, 0);
+			if(poll_ret)
+			{
+				ret = read(pipe_std, buff, 4096);
+				if(ret == -1)
+				{
+					pyfcgi_log(LOG_ERR, "Error reading python %s pipe : %s",
+						outnames[i], strerror(errno));
+					exit(PYFCGI_WORKER_FAIL);
+				}
+				pyfcgi_log(loglevels[i], "Pyton %s  : '%s'",
+					outnames[i], buff);
+			}
+			if(!isflush[i] && (!poll_ret || ret < 4096))
+			{
+				isflush[i] = 1;
+				PyObject_CallObject(flush[i], NULL);
+				if(PyErr_Occurred())
+				{
+					pyfcgi_log(LOG_ERR, "Exception while flushing %s",
+						outnames[i]);
+					log_expt(LOG_ERR);
+					exit(PYFCGI_WORKER_FAIL);
+				}
+			}
+		}while(poll_ret && !isflush[i]);
+	}
+}
+
 void worker_piper_sighandler(int signum)
 {
 	worker_piper_sigrcv = 1;