From 5046369e0c68ad97de0b551efd9b22f138ffaee7 Mon Sep 17 00:00:00 2001
From: b1v1r <b1v1r@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Mon, 27 Jul 2009 20:14:42 +0000
Subject: [PATCH] Add a MaxWorkerRequests limit to mlogc to force recycling
 workers after they have processed a number of requests.

---
 apache2/mlogc-src/mlogc-default.conf |  5 +++++
 apache2/mlogc-src/mlogc.c            | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/apache2/mlogc-src/mlogc-default.conf b/apache2/mlogc-src/mlogc-default.conf
index de8ee8cc..9d1d434b 100644
--- a/apache2/mlogc-src/mlogc-default.conf
+++ b/apache2/mlogc-src/mlogc-default.conf
@@ -64,6 +64,11 @@ ErrorLogLevel       3
 # over a slow link (e.g. not over a LAN).
 MaxConnections      10
 
+# How many requests a worker will process before recycling itself.
+# This is to help prevent problems due to any memory leaks that may
+# exists.
+MaxWorkerRequests   1000
+
 # The time each connection will sit idle before being reused,
 # in milliseconds. Increase if you don't want ModSecurity Console
 # to be hit with too many log collector requests.
diff --git a/apache2/mlogc-src/mlogc.c b/apache2/mlogc-src/mlogc.c
index de540cc5..8e5549fc 100644
--- a/apache2/mlogc-src/mlogc.c
+++ b/apache2/mlogc-src/mlogc.c
@@ -151,6 +151,7 @@ int                          keep_entries = 0;
 const char                  *log_repository = NULL;
 void                        *logline_regex = NULL;
 int                          max_connections = 10;
+int                          max_worker_requests = 1000;
 apr_global_mutex_t          *gmutex = NULL;
 apr_thread_mutex_t          *mutex = NULL;
 apr_pool_t                  *pool = NULL;
@@ -835,6 +836,13 @@ static void init_configuration(void)
         error_log(LOG_DEBUG2, NULL, "MaxConnections=%d", max_connections);
     }
 
+    s = apr_table_get(conf, "MaxWorkerRequests");
+    if (s != NULL) {
+        int v = atoi(s);
+        if (v >= 0) max_worker_requests = v;
+        error_log(LOG_DEBUG2, NULL, "MaxWorkerRequests=%d", max_worker_requests);
+    }
+
     s = apr_table_get(conf, "KeepAlive");
     if (s != NULL) {
         int v = atoi(s);
@@ -1221,6 +1229,7 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
     apr_pool_t *tpool;
     struct curl_slist *headerlist = NULL;
     char curl_error_buffer[CURL_ERROR_SIZE] = "";
+    int num_requests = 0;
 
     /* There is no need to do the sleep if this was an invalid entry
      * as the sleep is just to protect flooding the console server
@@ -1311,6 +1320,11 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
         error_log(LOG_DEBUG, thread, "Processing entry.");
         take_new = 0;
 
+        /* Keep track of requests processed if we need to */
+        if (max_worker_requests > 0) {
+            num_requests++;
+        }
+
         rc = pcre_exec(logline_regex, NULL, entry->line, entry->line_size, 0, 0,
             capturevector, CAPTUREVECTORSIZE);
         if (rc == PCRE_ERROR_NOMATCH) { /* No match. */
@@ -1479,6 +1493,15 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
                 take_new = 1;
                 nodelay = 1;
             }
+
+            /* If we are tracking num_requests, then shutdown if we are
+             * over our threshold.
+             */
+            if (num_requests && (num_requests >= max_worker_requests)) {
+                error_log(LOG_NOTICE, thread, "Reached max requests (%d) for this worker, exiting.", max_worker_requests);
+
+                goto THREAD_SHUTDOWN;
+            }
         }
 
         THREAD_CLEANUP: