You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/08/17 02:48:40 UTC
[apisix] branch master updated: fix: the phases after proxy should run when 500 happens before proxy (#7703)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 3ce743be8 fix: the phases after proxy should run when 500 happens before proxy (#7703)
3ce743be8 is described below
commit 3ce743be879cd14d141cfa8bc263ae9e5c66019c
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Wed Aug 17 10:48:35 2022 +0800
fix: the phases after proxy should run when 500 happens before proxy (#7703)
---
apisix/init.lua | 8 +++----
t/APISIX.pm | 1 +
t/error_page/error_page.t | 55 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/apisix/init.lua b/apisix/init.lua
index 5026ff6ba..c6ddf7c4f 100644
--- a/apisix/init.lua
+++ b/apisix/init.lua
@@ -417,6 +417,10 @@ function _M.http_access_phase()
api_ctx.route_id = route.value.id
api_ctx.route_name = route.value.name
+ local ref = ctxdump.stash_ngx_ctx()
+ core.log.info("stash ngx ctx: ", ref)
+ ngx_var.ctx_ref = ref
+
-- run global rule
plugin.run_global_rules(api_ctx, router.global_rules, nil)
@@ -546,10 +550,6 @@ function _M.http_access_phase()
-- run the before_proxy method in access phase first to avoid always reinit request
common_phase("before_proxy")
- local ref = ctxdump.stash_ngx_ctx()
- core.log.info("stash ngx ctx: ", ref)
- ngx_var.ctx_ref = ref
-
local up_scheme = api_ctx.upstream_scheme
if up_scheme == "grpcs" or up_scheme == "grpc" then
return ngx.exec("@grpc_pass")
diff --git a/t/APISIX.pm b/t/APISIX.pm
index ce1bc4585..999bcd8a1 100644
--- a/t/APISIX.pm
+++ b/t/APISIX.pm
@@ -598,6 +598,7 @@ _EOC_
more_clear_headers Date;
}
+ # this configuration is needed as error_page is configured in http block
location \@50x.html {
set \$from_error_page 'true';
content_by_lua_block {
diff --git a/t/error_page/error_page.t b/t/error_page/error_page.t
index 807d945a2..d6ec79a00 100644
--- a/t/error_page/error_page.t
+++ b/t/error_page/error_page.t
@@ -194,3 +194,58 @@ qr/(stash|fetch) ngx ctx/
--- grep_error_log_out
stash ngx ctx
fetch ngx ctx
+
+
+
+=== TEST 11: check if the phases after proxy are run when 500 happens before proxy
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "serverless-post-function": {
+ "functions" : ["return function() if ngx.var.http_x_test_status ~= nil then;ngx.exit(tonumber(ngx.var.http_x_test_status));end;end"]
+ },
+ "serverless-pre-function": {
+ "phase": "log",
+ "functions" : ["return function() ngx.log(ngx.WARN, 'run log phase in error_page') end"]
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/*"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: hit
+--- request
+GET /hello
+--- more_headers
+X-Test-Status: 500
+--- error_code: 500
+--- response_body_like
+.*apisix.apache.org.*
+--- error_log
+run log phase in error_page