[incubator-apisix] branch master updated: bugfix: removed stale objects from tcp logger (#1543)

[me...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 5570e64  bugfix: removed stale objects from tcp logger (#1543)
5570e64 is described below

commit 5570e6435648c458b74ef6b8eab9a49a1f88ebbb
Author: Nirojan Selvanathan <ss...@gmail.com>
AuthorDate: Thu May 7 06:23:49 2020 +0200

    bugfix: removed stale objects from tcp logger (#1543)
---
 apisix/plugins/tcp-logger.lua | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/apisix/plugins/tcp-logger.lua b/apisix/plugins/tcp-logger.lua
index 9eeef33..424b693 100644
--- a/apisix/plugins/tcp-logger.lua
+++ b/apisix/plugins/tcp-logger.lua
@@ -22,6 +22,9 @@ local tostring = tostring
 local buffers = {}
 local ngx = ngx
 local tcp = ngx.socket.tcp
+local ipairs   = ipairs
+local stale_timer_running = false;
+local timer_at = ngx.timer.at
 
 local schema = {
     type = "object",
@@ -95,6 +98,22 @@ local function send_tcp_data(conf, log_message)
 end
 
 
+local function remove_stale_objects(premature)
+    if premature then
+        return
+    end
+
+    for key, batch in ipairs(buffers) do
+        if #batch.entry_buffer.entries == 0 and #batch.batch_to_process == 0 then
+            core.log.debug("removing batch processor stale object, route id:", tostring(key))
+            buffers[key] = nil
+        end
+    end
+
+    stale_timer_running = false
+end
+
+
 function _M.log(conf)
     local entry = log_util.get_full_log(ngx)
 
@@ -105,6 +124,12 @@ function _M.log(conf)
 
     local log_buffer = buffers[entry.route_id]
 
+    if not stale_timer_running then
+        -- run the timer every 30 mins if any log is present
+        timer_at(1800, remove_stale_objects)
+        stale_timer_running = true
+    end
+
     if log_buffer then
         log_buffer:push(entry)
         return