Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(loop) only use set_log_level API on http subsystem #9

Merged
merged 6 commits into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/resty/timerng/thread/loop.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
local get_sys_filter_level = require("ngx.errlog").get_sys_filter_level
local set_log_level = require("resty.kong.log").set_log_level

local set_log_level

if ngx.config.subsystem == "http" then
set_log_level = require("resty.kong.log").set_log_level
end

local ngx_log = ngx.log
local ngx_EMERG = ngx.EMERG
Expand Down Expand Up @@ -171,7 +176,7 @@ local function loop_wrapper(premature, self)
while not ngx_worker_exiting() and not self._kill do
local global_level = _G.log_level

if global_level then
if global_level and ngx.config.subsystem == "http" then
local sys_filter_level = get_sys_filter_level()

if sys_filter_level ~= global_level then
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package = "lua-resty-timer-ng"
version = "0.2.1-1"
version = "0.2.2-1"
source = {
url = "git://github.com/kong/lua-resty-timer-ng",
tag = "0.2.1"
tag = "0.2.2"
}
description = {
summary = "A scalable timer library for OpenResty.",
Expand Down
58 changes: 56 additions & 2 deletions spec/07-bugs_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,42 @@ insulate("bugs of every timer | ", function ()

assert.is_false(flag)
end)
end)

insulate("dynamic log levels bugs | ", function ()
local timer = { }

randomize(false)

lazy_setup(function ()
timer = timer_module.new({
min_threads = 16,
max_threads = 32,
})

assert(timer:start())
end)

lazy_teardown(function ()
timer:freeze()
timer:destroy()

helper.wait_until(function ()
assert.same(1, timer_running_count())
return true
end)

end)

before_each(function ()
update_time()
end)

it("dynamically sets log level", function()
local sys_filter_level

_G.ngx.config.subsystem = "http"

_G.log_level = ngx.DEBUG -- Simulate a log level change from Kong
timer:named_at(nil, 0.3, function()
sys_filter_level = get_sys_filter_level()
Expand All @@ -102,12 +134,34 @@ insulate("bugs of every timer | ", function ()
ngx.sleep((0.3 + 1) * 10)
assert.is_equal(sys_filter_level, ngx.DEBUG)

_G.log_level = ngx.CRIT -- Simulate a log level change from Kong
_G.log_level = ngx.WARN -- Simulate a log level change from Kong
timer:named_every(nil, 0.3, function()
sys_filter_level = get_sys_filter_level()
end)

ngx.sleep((0.3 + 1) * 10)
assert.is_equal(sys_filter_level, ngx.WARN)
end)

it("only use set_log_level API on http subsystem", function()
local sys_filter_level

_G.ngx.config.subsystem = "stream"

_G.log_level = ngx.DEBUG -- Simulate a log level change from Kong
timer:named_at(nil, 0.3, function()
sys_filter_level = get_sys_filter_level()
end)

ngx.sleep((0.3 + 1) * 10)
assert.is_equal(sys_filter_level, ngx.WARN) -- not changed

_G.log_level = ngx.DEBUG -- Simulate a log level change from Kong
timer:named_every(nil, 0.3, function()
sys_filter_level = get_sys_filter_level()
end)

ngx.sleep((0.3 + 1) * 10)
assert.is_equal(sys_filter_level, ngx.CRIT)
assert.is_equal(sys_filter_level, ngx.WARN) -- not changed
end)
end)