Enhancement in timeout logging

Now logging a python traceback

include/python_pyfcgi.h

@@ -45,6 +45,7 @@
 #include "logger.h"
 #include "python_ioin.h"
 
+#define LIBPYFCGI_TIMEOUT_HEADERS "Content-Type: text/plain\r\nStatus: 504 Gateway Timeout\r\n\r\n"
 #define LIBPYFCGI_DEFAULT_HEADERS "Content-Type: text/html\r\nStatus: %s\r\n\r\n"
 #define LIBPYFCGI_DEFAULT_STATUS "200 OK"
 #define LIBPYFCGI_DEFAULT_CTYPE "Content-Type: text/html\r\n"
@@ -114,6 +115,15 @@ void libpyfcgi_send_headers();
  */
 PyObject* _pyfcgi_write_body(PyObject *body_data);
 
+/**@brief Called by the SIGALRM sighandler @ref worker_sigalrmhandler()
+ *
+ * If no headers sent send a timeout header.
+ *
+ * Attempt to generate a python exception and to log exception before
+ * exiting.
+ */
+void libpyfcgi_timeout();
+
 /* Defining Python module */
 
 /**@brief Public module initialisation function

src/python_pyfcgi.c

@@ -530,3 +530,15 @@ err_clean:
 	if(iter) { Py_DECREF(iter); }
 	Py_RETURN_NONE;
 }
+
+void libpyfcgi_timeout()
+{
+
+	if(!libpyfcgi.headers_sent)
+	{
+		FCGX_PutStr(LIBPYFCGI_TIMEOUT_HEADERS,
+			sizeof(LIBPYFCGI_TIMEOUT_HEADERS),
+			libpyfcgi.out);
+	}
+}
+

src/pyworker.c

@@ -20,6 +20,7 @@
 #include "pyworker.h"
 
 
+static short _wtimeout;
 /**@brief 1 if worker idle else 0 */
 static short _worker_idle;
 /**@brief Indicate that a worker is idle */
@@ -83,6 +84,7 @@ int work333(int wrk_id)
 		worker_set_busy();
 		count++;
 		environ = update_pyenv(py_osmod, envp);
+		_wtimeout = 0;
 
 		libpyfcgi_clean_response();
 		libpyfcgi.out = out_stream;
@@ -94,7 +96,19 @@ int work333(int wrk_id)
 		{
 			Py_INCREF(entry_ret);
 		}
-
+		
+		if(_wtimeout)
+		{
+			PyObject *type, *exc, *tb, *tmp;
+			// Changing exception to a TimeoutError, but keeping
+			// the traceback to display
+			PyErr_Fetch(&type, &exc, &tb);
+			PyErr_SetString(PyExc_TimeoutError, "Request timeout");
+			PyErr_Fetch(&type, &exc, &tmp);
+			PyErr_Restore(type, exc, tb);
+			log_expt(LOG_ERR);
+			libpyfcgi_timeout(); // Sending headers if possible
+		}
 		if(PyErr_Occurred())
 		{
 			pyfcgi_log(LOG_ERR, "PEP333 entrypoint function triggered an exception");
@@ -132,6 +146,10 @@ int work333(int wrk_id)
 			stop.tv_sec -= 1;
 		}
 		pyfcgi_wd_pause();
+		if(_wtimeout)
+		{
+			exit(PYFCGI_TIMEOUT);
+		}
 		pyfcgi_log(LOG_DEBUG, "Worker[%d] request %d END [OK] %lu bytes in %ld.%06lds",
 			wrk_id, count, libpyfcgi.rep_sz, stop.tv_sec, stop.tv_usec);
 
@@ -625,7 +643,12 @@ void worker_sighandler(int signum)
 
 void worker_sigalrmhandler(int signum)
 {
-	//pyfcgi_log(LOG_WARNING, "Timeout, exiting...");
+	_wtimeout = 1;
+	if(!_worker_idle)
+	{
+		// Call PyErr_Interrupt() in order to stop python
+		PyErr_SetInterrupt();
+	}
 	worker_set_busy();
-	exit(PYFCGI_TIMEOUT);
+	return;
 }

src/responder.c

@@ -202,7 +202,7 @@ int responder_loop()
 				busy_start = time(NULL);
 			}
 			else if(time(NULL) - busy_start > 0 &&
-				wanted_n <= PyFCGI_conf.max_wrk)
+				wanted_n < PyFCGI_conf.max_wrk)
 			{
 				pyfcgi_log( LOG_DEBUG,
 					"All workers busy, spawning a new one");