From 3b728e7a8b7425ebe0adb9d50e3965abd2357d52 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 10:55:13 +0800 Subject: [PATCH 01/19] add init_worker in 03-get_target_status.t --- t/with_resty-events/03-get_target_status.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/with_resty-events/03-get_target_status.t b/t/with_resty-events/03-get_target_status.t index 455654c5..92538332 100644 --- a/t/with_resty-events/03-get_target_status.t +++ b/t/with_resty-events/03-get_target_status.t @@ -15,6 +15,8 @@ our $HttpConfig = qq{ init_worker_by_lua_block { local we = require "resty.events.compat" assert(we.configure({ + unique_timeout = 5, + broker_id = 0, listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" })) assert(we.configured()) From ae6067fab68cb4d1899e295e300cf393d1307d34 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 11:57:01 +0800 Subject: [PATCH 02/19] fix 03-get_target_status.t --- t/with_resty-events/03-get_target_status.t | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/t/with_resty-events/03-get_target_status.t b/t/with_resty-events/03-get_target_status.t index 92538332..c69ed404 100644 --- a/t/with_resty-events/03-get_target_status.t +++ b/t/with_resty-events/03-get_target_status.t @@ -82,12 +82,16 @@ qq{ } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2115, nil, true) + ngx.sleep(0.002) -- wait for initial timers to run once ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- true + checker:report_tcp_failure("127.0.0.1", 2115) + ngx.sleep(0.002) -- wait for initial timers to run once ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- false + checker:report_success("127.0.0.1", 2115) + ngx.sleep(0.002) -- wait for initial timers to run once ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- true } } From 990361fa193300e8631189870dce3cdc9f57f717 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 12:12:32 +0800 Subject: [PATCH 03/19] fix 03-get_target_status_with_sleeps.t --- t/with_resty-events/03-get_target_status_with_sleeps.t | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/with_resty-events/03-get_target_status_with_sleeps.t b/t/with_resty-events/03-get_target_status_with_sleeps.t index 6dc9d776..53c2b7a0 100644 --- a/t/with_resty-events/03-get_target_status_with_sleeps.t +++ b/t/with_resty-events/03-get_target_status_with_sleeps.t @@ -82,15 +82,14 @@ qq{ } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2115, nil, true) - ngx.sleep(0.1) + ngx.sleep(0.01) ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- true checker:report_tcp_failure("127.0.0.1", 2115) - ngx.sleep(0.1) + ngx.sleep(0.01) ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- false checker:report_success("127.0.0.1", 2115) - ngx.sleep(0.1) + ngx.sleep(0.01) ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- true } } From f27f99def06ca741ae33003a6fc1ae509f07f82a Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 12:17:35 +0800 Subject: [PATCH 04/19] fix 04-report_success.t --- t/with_resty-events/03-get_target_status.t | 6 +++--- t/with_resty-events/04-report_success.t | 14 ++++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/t/with_resty-events/03-get_target_status.t b/t/with_resty-events/03-get_target_status.t index c69ed404..6b8e795c 100644 --- a/t/with_resty-events/03-get_target_status.t +++ b/t/with_resty-events/03-get_target_status.t @@ -83,15 +83,15 @@ qq{ } }) local ok, err = checker:add_target("127.0.0.1", 2115, nil, true) - ngx.sleep(0.002) -- wait for initial timers to run once + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- true checker:report_tcp_failure("127.0.0.1", 2115) - ngx.sleep(0.002) -- wait for initial timers to run once + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- false checker:report_success("127.0.0.1", 2115) - ngx.sleep(0.002) -- wait for initial timers to run once + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115)) -- true } } diff --git a/t/with_resty-events/04-report_success.t b/t/with_resty-events/04-report_success.t index 020f0190..f60dee2e 100644 --- a/t/with_resty-events/04-report_success.t +++ b/t/with_resty-events/04-report_success.t @@ -15,6 +15,8 @@ our $HttpConfig = qq{ init_worker_by_lua_block { local we = require "resty.events.compat" assert(we.configure({ + unique_timeout = 5, + broker_id = 0, listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" })) assert(we.configured()) @@ -83,15 +85,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2116, nil, false) local ok, err = checker:add_target("127.0.0.1", 2118, nil, false) + ngx.sleep(0.002) checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2118, nil, "passive") checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2118, nil, "passive") checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2118, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2116)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2118)) -- true } @@ -157,15 +160,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2116, nil, false) local ok, err = checker:add_target("127.0.0.1", 2118, nil, false) + ngx.sleep(0.002) checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2118, nil, "passive") checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2118, nil, "passive") checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2118, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2116)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2118)) -- true } @@ -230,11 +234,12 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2116, nil, false) + ngx.sleep(0.002) checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2116, nil, "active") checker:report_success("127.0.0.1", 2116, nil, "active") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2116)) -- false } } @@ -293,11 +298,12 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2118, nil, false) + ngx.sleep(0.002) checker:report_success("127.0.0.1", 2118, nil, "passive") checker:report_success("127.0.0.1", 2118, nil, "passive") checker:report_success("127.0.0.1", 2118, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2118, nil)) -- false } } From db6661df2584e2df496e9317516c876cc17cc0bd Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 12:26:15 +0800 Subject: [PATCH 05/19] fix 05/06 --- t/with_resty-events/05-report_failure.t | 25 +++++++----- t/with_resty-events/06-report_http_status.t | 44 +++++++++++---------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/t/with_resty-events/05-report_failure.t b/t/with_resty-events/05-report_failure.t index 5f5a1afe..55ee5e8b 100644 --- a/t/with_resty-events/05-report_failure.t +++ b/t/with_resty-events/05-report_failure.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -45,8 +55,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -77,15 +85,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2117, nil, true) local ok, err = checker:add_target("127.0.0.1", 2113, nil, true) + ngx.sleep(0.002) checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2117, nil)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2113, nil)) -- false } @@ -121,8 +130,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -153,15 +160,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2117, nil, true) local ok, err = checker:add_target("127.0.0.1", 2113, nil, true) + ngx.sleep(0.002) checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2117, nil)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2113, nil)) -- false } @@ -195,8 +203,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -227,15 +233,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2117, nil, true) local ok, err = checker:add_target("127.0.0.1", 2113, nil, true) + ngx.sleep(0.002) checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") checker:report_failure("127.0.0.1", 2117, nil, "active") checker:report_failure("127.0.0.1", 2113, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2117, nil)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2113, nil)) -- true } diff --git a/t/with_resty-events/06-report_http_status.t b/t/with_resty-events/06-report_http_status.t index d585cf61..2f134271 100644 --- a/t/with_resty-events/06-report_http_status.t +++ b/t/with_resty-events/06-report_http_status.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -45,8 +55,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -77,15 +85,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2119, nil, true) local ok, err = checker:add_target("127.0.0.1", 2113, nil, true) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") checker:report_http_status("127.0.0.1", 2113, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") checker:report_http_status("127.0.0.1", 2113, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") checker:report_http_status("127.0.0.1", 2113, nil, 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2119)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2113)) -- false } @@ -122,8 +131,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -154,9 +161,9 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2119, nil, false) local ok, err = checker:add_target("127.0.0.1", 2113, nil, false) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") checker:report_http_status("127.0.0.1", 2113, nil, 200, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") @@ -165,6 +172,7 @@ events_module = "resty.events", checker:report_http_status("127.0.0.1", 2113, nil, 200, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") checker:report_http_status("127.0.0.1", 2113, nil, 200, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2119)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2113)) -- true } @@ -202,8 +210,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -234,12 +240,13 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2119, nil, false) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 200, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 200, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 200, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 200, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2119, nil)) -- false } } @@ -267,8 +274,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -299,12 +304,13 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2119, nil, false) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") checker:report_http_status("127.0.0.1", 2119, nil, 200, "active") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2119, nil)) -- false } } @@ -332,8 +338,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -364,12 +368,13 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2119, nil, true) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2119)) -- true } } @@ -397,8 +402,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -429,12 +432,13 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2119, nil, true) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") checker:report_http_status("127.0.0.1", 2119, nil, 500, "active") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2119, nil)) -- true } } @@ -458,8 +462,6 @@ qq{ ngx.say("OK") } log_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -479,11 +481,13 @@ events_module = "resty.events", } }) local ok, err = checker:add_target("127.0.0.1", 2119, nil, true) + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") + ngx.sleep(0.002) checker:report_http_status("127.0.0.1", 2119, nil, 500, "passive") } } From 4b1d8aac09605c8c978a678aae0b050910ddcf0b Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 13:35:22 +0800 Subject: [PATCH 06/19] fix 07/08 --- t/with_resty-events/07-report_tcp_failure.t | 25 +++++++++++++-------- t/with_resty-events/08-report_timeout.t | 25 +++++++++++++-------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/t/with_resty-events/07-report_tcp_failure.t b/t/with_resty-events/07-report_tcp_failure.t index bcba88fc..468eede9 100644 --- a/t/with_resty-events/07-report_tcp_failure.t +++ b/t/with_resty-events/07-report_tcp_failure.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -45,8 +55,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -77,15 +85,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2120, nil, true) local ok, err = checker:add_target("127.0.0.1", 2113, nil, true) + ngx.sleep(0.002) checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "active") checker:report_tcp_failure("127.0.0.1", 2113, nil, nil, "passive") checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "active") checker:report_tcp_failure("127.0.0.1", 2113, nil, nil, "passive") checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "active") checker:report_tcp_failure("127.0.0.1", 2113, nil, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2120)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2113)) -- false } @@ -121,8 +130,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -153,11 +160,12 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2120, nil, true) + ngx.sleep(0.002) checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "active") checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "active") checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "active") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2120)) -- true } } @@ -186,8 +194,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -218,11 +224,12 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2120, nil, true) + ngx.sleep(0.002) checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "passive") checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "passive") checker:report_tcp_failure("127.0.0.1", 2120, nil, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2120)) -- true } } diff --git a/t/with_resty-events/08-report_timeout.t b/t/with_resty-events/08-report_timeout.t index 8a7268e6..84966f3e 100644 --- a/t/with_resty-events/08-report_timeout.t +++ b/t/with_resty-events/08-report_timeout.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -45,8 +55,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -79,13 +87,14 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2122, nil, true) local ok, err = checker:add_target("127.0.0.1", 2113, nil, true) + ngx.sleep(0.002) checker:report_timeout("127.0.0.1", 2122, nil, "active") checker:report_timeout("127.0.0.1", 2113, nil, "passive") checker:report_timeout("127.0.0.1", 2122, nil, "active") checker:report_timeout("127.0.0.1", 2113, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2122)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2113)) -- false } @@ -119,8 +128,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -153,11 +160,12 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2122, nil, true) + ngx.sleep(0.002) checker:report_timeout("127.0.0.1", 2122, nil, "active") checker:report_timeout("127.0.0.1", 2122, nil, "active") checker:report_timeout("127.0.0.1", 2122, nil, "active") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2122)) -- true } } @@ -186,8 +194,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -220,11 +226,12 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2122, nil, true) + ngx.sleep(0.002) checker:report_timeout("127.0.0.1", 2122, nil, "passive") checker:report_timeout("127.0.0.1", 2122, nil, "passive") checker:report_timeout("127.0.0.1", 2122, nil, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2122)) -- true } } From ca853f25dbf3719188448ec56a899ccbcc62f111 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 13:46:00 +0800 Subject: [PATCH 07/19] fix 09 --- t/with_resty-events/09-active_probes.t | 31 +++++++++++--------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/t/with_resty-events/09-active_probes.t b/t/with_resty-events/09-active_probes.t index 19d074df..1a708205 100644 --- a/t/with_resty-events/09-active_probes.t +++ b/t/with_resty-events/09-active_probes.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -45,8 +55,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -102,8 +110,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -157,8 +163,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -214,8 +218,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -278,8 +280,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -323,8 +323,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -380,8 +378,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -443,8 +439,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -486,6 +480,9 @@ checking unhealthy targets: nothing to do qq{ $::HttpConfig + # ignore lua tcp socket read timed out + lua_socket_log_errors off; + server { listen 2114; location = /status { @@ -499,8 +496,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ test = true, From e02d6877a0f163065c2da28680a448faa703d639 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 13:52:51 +0800 Subject: [PATCH 08/19] change 10 --- t/with_resty-events/10-garbagecollect.t | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/t/with_resty-events/10-garbagecollect.t b/t/with_resty-events/10-garbagecollect.t index 398007c0..e12faf8e 100644 --- a/t/with_resty-events/10-garbagecollect.t +++ b/t/with_resty-events/10-garbagecollect.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -45,14 +55,7 @@ qq{ --- config location = /t { content_by_lua_block { - ngx.shared.my_worker_events:flush_all() local dump = function(...) ngx.log(ngx.DEBUG,"\027[31m\n", require("pl.pretty").write({...}),"\027[0m") end - local we = require "resty.events.compat" - assert(we.configure { - shm = "my_worker_events", - interval = 0.1, - debug = true, - }) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", From 2e1bebeec75d59ad2f5c6f14a7de6528a29128cd Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 13:55:12 +0800 Subject: [PATCH 09/19] fix 11 --- t/with_resty-events/11-clear.t | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/t/with_resty-events/11-clear.t b/t/with_resty-events/11-clear.t index 38ce3c89..6ca929e8 100644 --- a/t/with_resty-events/11-clear.t +++ b/t/with_resty-events/11-clear.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -33,8 +43,6 @@ __DATA__ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local config = { name = "testing", @@ -89,8 +97,6 @@ initial target list (11 targets) --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local config = { name = "testing", @@ -143,8 +149,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local config = { name = "testing", @@ -189,8 +193,6 @@ unhealthy HTTP increment (3/3) for '(127.0.0.1:21120)' --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local config = { name = "testing", @@ -238,8 +240,6 @@ target not found --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local config = { name = "testing", From 9e2fcd34f1426d147a93b0e4a9feafd6a8f9035d Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 13:59:23 +0800 Subject: [PATCH 10/19] fix 12 --- t/with_resty-events/12-set_target_status.t | 43 +++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/t/with_resty-events/12-set_target_status.t b/t/with_resty-events/12-set_target_status.t index 35eedc46..f725b278 100644 --- a/t/with_resty-events/12-set_target_status.t +++ b/t/with_resty-events/12-set_target_status.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -36,20 +46,20 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", events_module = "resty.events", }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2112, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true checker:set_target_status("127.0.0.1", 2112, nil, false) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- false checker:set_target_status("127.0.0.1", 2112, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true } } @@ -59,6 +69,8 @@ GET /t true false true + + === TEST 2: set_target_status() restores node after passive check disables it --- http_config eval qq{ @@ -67,8 +79,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -83,13 +93,15 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2112, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true checker:report_http_status("127.0.0.1", 2112, nil, 500) checker:report_http_status("127.0.0.1", 2112, nil, 500) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- false checker:set_target_status("127.0.0.1", 2112, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true } } @@ -99,6 +111,8 @@ GET /t true false true + + === TEST 3: set_target_status() resets the failure counters --- http_config eval qq{ @@ -107,8 +121,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -126,14 +138,16 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2112, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true checker:report_http_status("127.0.0.1", 2112, nil, 500) checker:set_target_status("127.0.0.1", 2112, nil, true) checker:report_http_status("127.0.0.1", 2112, nil, 500) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true checker:report_http_status("127.0.0.1", 2112, nil, 500) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- false } } @@ -143,6 +157,8 @@ GET /t true true false + + === TEST 3: set_target_status() resets the success counters --- http_config eval qq{ @@ -151,13 +167,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { passive = { healthy = { @@ -170,15 +184,18 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2112, nil, true) + ngx.sleep(0.002) checker:set_target_status("127.0.0.1", 2112, nil, false) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- false checker:report_http_status("127.0.0.1", 2112, nil, 200) checker:set_target_status("127.0.0.1", 2112, nil, false) checker:report_http_status("127.0.0.1", 2112, nil, 200) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- false checker:report_http_status("127.0.0.1", 2112, nil, 200) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112)) -- true } } From bbdf2ceb690896f06e7b60d041cb0c39c0caaf42 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:02:35 +0800 Subject: [PATCH 11/19] change 13 --- t/with_resty-events/13-integration.t | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/t/with_resty-events/13-integration.t b/t/with_resty-events/13-integration.t index aa8db1a9..285dcf23 100644 --- a/t/with_resty-events/13-integration.t +++ b/t/with_resty-events/13-integration.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -42,8 +52,6 @@ qq{ local host = "127.0.0.1" local port = 2112 - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ test = true, From 261f6fff3b0ed2e71db6325bdc3c462d50b45bb8 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:13:46 +0800 Subject: [PATCH 12/19] fix 15 --- .../15-get_virtualhost_target_status.t | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/t/with_resty-events/15-get_virtualhost_target_status.t b/t/with_resty-events/15-get_virtualhost_target_status.t index b23dc7f5..4dc0e332 100644 --- a/t/with_resty-events/15-get_virtualhost_target_status.t +++ b/t/with_resty-events/15-get_virtualhost_target_status.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -36,8 +46,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -67,18 +75,22 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2115, "ahostname", true) local ok, err = checker:add_target("127.0.0.1", 2115, "otherhostname", true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115, "ahostname")) -- true ngx.say(checker:get_target_status("127.0.0.1", 2115, "otherhostname")) -- true checker:report_http_status("127.0.0.1", 2115, "otherhostname", 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115, "otherhostname")) -- true checker:report_http_status("127.0.0.1", 2115, "otherhostname", 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115, "otherhostname")) -- false checker:report_success("127.0.0.1", 2115, "otherhostname") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115, "otherhostname")) -- true checker:report_tcp_failure("127.0.0.1", 2115, "otherhostname") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2115, "otherhostname")) -- false ngx.say(checker:get_target_status("127.0.0.1", 2115, "ahostname")) -- true local _, err = checker:get_target_status("127.0.0.1", 2115) @@ -111,8 +123,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -142,12 +152,13 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2116, "ahostname", true) local ok, err = checker:add_target("127.0.0.1", 2116, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2116, "ahostname")) -- true ngx.say(checker:get_target_status("127.0.0.1", 2116)) -- true checker:report_http_status("127.0.0.1", 2116, nil, 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2116, "ahostname")) -- true ngx.say(checker:get_target_status("127.0.0.1", 2116)) -- false } @@ -188,8 +199,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -209,7 +218,6 @@ events_module = "resty.events", }, } }) - ngx.sleep(1) -- active healthchecks might take up to 1s to start local ok, err = checker:add_target("127.0.0.1", 2117, "healthyserver", true) local ok, err = checker:add_target("127.0.0.1", 2117, "unhealthyserver", true) ngx.sleep(0.6) -- wait for 6x the check interval @@ -242,8 +250,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -273,19 +279,21 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once local ok, err = checker:add_target("127.0.0.1", 2118, "127.0.0.1", true) local ok, err = checker:add_target("127.0.0.1", 2119, nil, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2118, "127.0.0.1")) -- true ngx.say(checker:get_target_status("127.0.0.1", 2119)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2118)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2119, "127.0.0.1")) -- true checker:report_http_status("127.0.0.1", 2118, nil, 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2118, "127.0.0.1")) -- false ngx.say(checker:get_target_status("127.0.0.1", 2119)) -- true ngx.say(checker:get_target_status("127.0.0.1", 2118)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2119, "127.0.0.1")) -- true checker:report_http_status("127.0.0.1", 2119, "127.0.0.1", 500, "passive") + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2118, "127.0.0.1")) -- false ngx.say(checker:get_target_status("127.0.0.1", 2119)) -- false ngx.say(checker:get_target_status("127.0.0.1", 2118)) -- false From 7370ff9ef4c91390b65d539b7c219c13e84f05aa Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:18:53 +0800 Subject: [PATCH 13/19] partial fix 16 --- .../16-set_all_target_statuses_for_hostname.t | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/t/with_resty-events/16-set_all_target_statuses_for_hostname.t b/t/with_resty-events/16-set_all_target_statuses_for_hostname.t index 3cd8da96..e4334ece 100644 --- a/t/with_resty-events/16-set_all_target_statuses_for_hostname.t +++ b/t/with_resty-events/16-set_all_target_statuses_for_hostname.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -36,23 +46,23 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", events_module = "resty.events", }) - ngx.sleep(0.1) -- wait for initial timers to run once checker:add_target("127.0.0.1", 2112, "rush", true) checker:add_target("127.0.0.2", 2112, "rush", true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true checker:set_all_target_statuses_for_hostname("rush", 2112, false) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- false ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- false checker:set_all_target_statuses_for_hostname("rush", 2112, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true } @@ -66,6 +76,8 @@ false false true true + + === TEST 2: set_all_target_statuses_for_hostname() restores node after passive check disables it --- http_config eval qq{ @@ -74,8 +86,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -90,15 +100,17 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once checker:add_target("127.0.0.1", 2112, "rush", true) checker:add_target("127.0.0.2", 2112, "rush", true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true checker:report_http_status("127.0.0.1", 2112, "rush", 500) checker:report_http_status("127.0.0.1", 2112, "rush", 500) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- false checker:set_all_target_statuses_for_hostname("rush", 2112, true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true } @@ -111,6 +123,8 @@ true false true true + + === TEST 3: set_all_target_statuses_for_hostname() resets failure counters --- http_config eval qq{ @@ -119,8 +133,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -138,17 +150,19 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once checker:add_target("127.0.0.1", 2112, "rush", true) checker:add_target("127.0.0.2", 2112, "rush", true) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true checker:report_http_status("127.0.0.1", 2112, "rush", 500) checker:set_all_target_statuses_for_hostname("rush", 2112, true) checker:report_http_status("127.0.0.1", 2112, "rush", 500) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true checker:report_http_status("127.0.0.1", 2112, "rush", 500) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- false ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- true } @@ -162,6 +176,8 @@ true true false true + + === TEST 4: set_target_status() resets the success counters --- http_config eval qq{ @@ -170,8 +186,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -189,18 +203,20 @@ events_module = "resty.events", } } }) - ngx.sleep(0.1) -- wait for initial timers to run once checker:add_target("127.0.0.1", 2112, "rush", true) checker:add_target("127.0.0.2", 2112, "rush", true) checker:set_all_target_statuses_for_hostname("rush", 2112, false) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- false ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- false checker:report_http_status("127.0.0.1", 2112, "rush", 200) checker:set_all_target_statuses_for_hostname("rush", 2112, false) checker:report_http_status("127.0.0.1", 2112, "rush", 200) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- false ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- false checker:report_http_status("127.0.0.1", 2112, "rush", 200) + ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- true ngx.say(checker:get_target_status("127.0.0.2", 2112, "rush")) -- false } From e14250e0e9227a77a195f8cede5ab008255736e3 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:21:41 +0800 Subject: [PATCH 14/19] change 17 --- t/with_resty-events/17-mtls.t | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/t/with_resty-events/17-mtls.t b/t/with_resty-events/17-mtls.t index 582b6faa..c0d0afc3 100644 --- a/t/with_resty-events/17-mtls.t +++ b/t/with_resty-events/17-mtls.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -36,9 +46,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) - local pl_file = require "pl.file" local cert = pl_file.read("t/with_resty-events/util/cert.pem", true) local key = pl_file.read("t/with_resty-events/util/key.pem", true) @@ -47,7 +54,7 @@ qq{ local checker = healthcheck.new({ name = "testing_mtls", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", type = "http", ssl_cert = cert, ssl_key = key, @@ -92,9 +99,6 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) - local pl_file = require "pl.file" local ssl = require "ngx.ssl" local cert = ssl.parse_pem_cert(pl_file.read("t/with_resty-events/util/cert.pem", true)) From 636c2a94b1d0892cb6fc9944073cdc5883105aab Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:23:10 +0800 Subject: [PATCH 15/19] fix 18 --- t/with_resty-events/18-req-headers.t | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/t/with_resty-events/18-req-headers.t b/t/with_resty-events/18-req-headers.t index cc7218a9..7fd69c33 100644 --- a/t/with_resty-events/18-req-headers.t +++ b/t/with_resty-events/18-req-headers.t @@ -10,6 +10,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -41,13 +51,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", @@ -92,13 +100,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", @@ -142,13 +148,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", @@ -193,13 +197,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", @@ -244,13 +246,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", From e1164321ea0ed1a361609440d855a0d3c1437c5f Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:48:15 +0800 Subject: [PATCH 16/19] change 13 --- t/with_resty-events/13-integration.t | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/t/with_resty-events/13-integration.t b/t/with_resty-events/13-integration.t index 285dcf23..d08e76da 100644 --- a/t/with_resty-events/13-integration.t +++ b/t/with_resty-events/13-integration.t @@ -132,12 +132,14 @@ events_module = "resty.events", -- that implements the specified behavior. local function run_test_case(case) assert(checker:set_target_status(host, port, nil, true)) + ngx.sleep(0.002) local i = 1 local s, f, t, o = 0, 0, 0, 0 local mode = true for c in case:gmatch(".") do if c == "S" then checker:report_http_status(host, port, nil, 200, "passive") + ngx.sleep(0.002) s = s + 1 f, t, o = 0, 0, 0 if s == 2 then @@ -145,6 +147,7 @@ events_module = "resty.events", end elseif c == "F" then checker:report_http_status(host, port, nil, 500, "passive") + ngx.sleep(0.002) f = f + 1 s = 0 if f == 2 then @@ -152,6 +155,7 @@ events_module = "resty.events", end elseif c == "T" then checker:report_tcp_failure(host, port, nil, "read", "passive") + ngx.sleep(0.002) t = t + 1 s = 0 if t == 2 then @@ -159,6 +163,7 @@ events_module = "resty.events", end elseif c == "O" then checker:report_timeout(host, port, nil, "passive") + ngx.sleep(0.002) o = o + 1 s = 0 if o == 2 then From 01007448e6204de0e8e72b82b9840fad78251b7d Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 14:50:14 +0800 Subject: [PATCH 17/19] fix 16 --- t/with_resty-events/16-set_all_target_statuses_for_hostname.t | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/with_resty-events/16-set_all_target_statuses_for_hostname.t b/t/with_resty-events/16-set_all_target_statuses_for_hostname.t index e4334ece..d627a9c6 100644 --- a/t/with_resty-events/16-set_all_target_statuses_for_hostname.t +++ b/t/with_resty-events/16-set_all_target_statuses_for_hostname.t @@ -190,7 +190,7 @@ qq{ local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { passive = { healthy = { @@ -205,6 +205,7 @@ events_module = "resty.events", }) checker:add_target("127.0.0.1", 2112, "rush", true) checker:add_target("127.0.0.2", 2112, "rush", true) + ngx.sleep(0.002) checker:set_all_target_statuses_for_hostname("rush", 2112, false) ngx.sleep(0.002) ngx.say(checker:get_target_status("127.0.0.1", 2112, "rush")) -- false From 72e3527e55b3af986d169a6ae317f32c36b6e0d6 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 15:01:56 +0800 Subject: [PATCH 18/19] style 05 --- t/with_resty-events/05-report_failure.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/with_resty-events/05-report_failure.t b/t/with_resty-events/05-report_failure.t index 55ee5e8b..9f50b217 100644 --- a/t/with_resty-events/05-report_failure.t +++ b/t/with_resty-events/05-report_failure.t @@ -59,7 +59,7 @@ qq{ local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", type = "http", checks = { active = { @@ -134,7 +134,7 @@ qq{ local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", type = "tcp", checks = { active = { @@ -207,7 +207,7 @@ qq{ local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", type = "tcp", checks = { active = { From 7427b62db27183744e4cccd480d00a01c0fd70b9 Mon Sep 17 00:00:00 2001 From: chronolaw Date: Fri, 10 Jun 2022 16:12:07 +0800 Subject: [PATCH 19/19] fix 01/02 --- t/with_resty-events/01-start-stop.t | 18 ++++++++++-------- t/with_resty-events/02-add_target.t | 22 +++++++++++++--------- t/with_resty-events/10-garbagecollect.t | 2 +- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/t/with_resty-events/01-start-stop.t b/t/with_resty-events/01-start-stop.t index c52a021c..152355f7 100644 --- a/t/with_resty-events/01-start-stop.t +++ b/t/with_resty-events/01-start-stop.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -33,8 +43,6 @@ __DATA__ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -70,8 +78,6 @@ true --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -110,8 +116,6 @@ true --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", @@ -145,8 +149,6 @@ checking --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", diff --git a/t/with_resty-events/02-add_target.t b/t/with_resty-events/02-add_target.t index ae147a00..0815f613 100644 --- a/t/with_resty-events/02-add_target.t +++ b/t/with_resty-events/02-add_target.t @@ -12,6 +12,16 @@ our $HttpConfig = qq{ lua_package_path "$pwd/lib/?.lua;;"; lua_shared_dict test_shm 8m; + init_worker_by_lua_block { + local we = require "resty.events.compat" + assert(we.configure({ + unique_timeout = 5, + broker_id = 0, + listening = "unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock" + })) + assert(we.configured()) + } + server { server_name kong_worker_events; listen unix:$ENV{TEST_NGINX_SERVROOT}/worker_events.sock; @@ -33,13 +43,11 @@ __DATA__ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { healthy = { @@ -85,13 +93,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", @@ -138,13 +144,11 @@ qq{ --- config location = /t { content_by_lua_block { - local we = require "resty.events.compat" - assert(we.configure({ unique_timeout = 5, broker_id = 0, listening = "unix:" .. ngx.config.prefix() .. "worker_events.sock" })) local healthcheck = require("resty.healthcheck") local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", checks = { active = { http_path = "/status", diff --git a/t/with_resty-events/10-garbagecollect.t b/t/with_resty-events/10-garbagecollect.t index e12faf8e..42a2778f 100644 --- a/t/with_resty-events/10-garbagecollect.t +++ b/t/with_resty-events/10-garbagecollect.t @@ -60,7 +60,7 @@ qq{ local checker = healthcheck.new({ name = "testing", shm_name = "test_shm", -events_module = "resty.events", + events_module = "resty.events", type = "http", checks = { active = {