Skip to content

Commit

Permalink
bugfix: removed stale objects from tcp logger (#1543)
Browse files Browse the repository at this point in the history
  • Loading branch information
sshniro authored May 7, 2020
1 parent fd626ae commit 5570e64
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions apisix/plugins/tcp-logger.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)

Expand All @@ -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
Expand Down

0 comments on commit 5570e64

Please sign in to comment.