fix(ext-plugin): should use separate tokens for {pre,post}-req

Signed-off-by: spacewander <[email protected]>
apache · Jun 21, 2021 · 174044e · 174044e
1 parent f54784b
commit 174044e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/apisix/plugins/ext-plugin-post-req.lua b/apisix/plugins/ext-plugin-post-req.lua
@@ -18,10 +18,11 @@ local core = require("apisix.core")
 local ext = require("apisix.plugins.ext-plugin.init")
 
 
+local name = "ext-plugin-post-req"
 local _M = {
     version = 0.1,
     priority = -3000,
-    name = "ext-plugin-post-req",
+    name = name,
     schema = ext.schema,
 }
 
@@ -32,7 +33,7 @@ end
 
 
 function _M.access(conf, ctx)
-    return ext.communicate(conf, ctx)
+    return ext.communicate(conf, ctx, name)
 end
 
 

diff --git a/apisix/plugins/ext-plugin-pre-req.lua b/apisix/plugins/ext-plugin-pre-req.lua
@@ -18,10 +18,11 @@ local core = require("apisix.core")
 local ext = require("apisix.plugins.ext-plugin.init")
 
 
+local name = "ext-plugin-pre-req"
 local _M = {
     version = 0.1,
     priority = 12000,
-    name = "ext-plugin-pre-req",
+    name = name,
     schema = ext.schema,
 }
 
@@ -32,7 +33,7 @@ end
 
 
 function _M.rewrite(conf, ctx)
-    return ext.communicate(conf, ctx)
+    return ext.communicate(conf, ctx, name)
 end
 
 

diff --git a/apisix/plugins/ext-plugin/init.lua b/apisix/plugins/ext-plugin/init.lua
@@ -305,8 +305,8 @@ local rpc_handlers = {
         core.log.notice("get conf token: ", token, " conf: ", core.json.delay_encode(conf.conf))
         return token
     end,
-    function (conf, ctx, sock)
-        local token, err = core.lrucache.plugin_ctx(lrucache, ctx, nil, rpc_call,
+    function (conf, ctx, sock, entry)
+        local token, err = core.lrucache.plugin_ctx(lrucache, ctx, entry, rpc_call,
                                                     constants.RPC_PREPARE_CONF, conf, ctx)
         if not token then
             return nil, err
@@ -498,7 +498,7 @@ local rpc_handlers = {
 }
 
 
-rpc_call = function (ty, conf, ctx)
+rpc_call = function (ty, conf, ctx, ...)
     local path = helper.get_path()
 
     local sock = socket_tcp()
@@ -508,7 +508,7 @@ rpc_call = function (ty, conf, ctx)
         return nil, "failed to connect to the unix socket " .. path .. ": " .. err
     end
 
-    local res, err, code, body = rpc_handlers[ty + 1](conf, ctx, sock)
+    local res, err, code, body = rpc_handlers[ty + 1](conf, ctx, sock, ...)
     if not res then
         sock:close()
         return nil, err
@@ -535,12 +535,12 @@ local function create_lrucache()
 end
 
 
-function _M.communicate(conf, ctx)
+function _M.communicate(conf, ctx, plugin_name)
     local ok, err, code, body
     local tries = 0
     while tries < 3 do
         tries = tries + 1
-        ok, err, code, body = rpc_call(constants.RPC_HTTP_REQ_CALL, conf, ctx)
+        ok, err, code, body = rpc_call(constants.RPC_HTTP_REQ_CALL, conf, ctx, plugin_name)
         if ok then
             if code then
                 return code, body

diff --git a/t/plugin/ext-plugin/sanity.t b/t/plugin/ext-plugin/sanity.t
@@ -81,8 +81,8 @@ __DATA__
                  [[{
                     "uri": "/hello",
                     "plugins": {
-                        "ext-plugin-pre-req": {},
-                        "ext-plugin-post-req": {}
+                        "ext-plugin-pre-req": {"a":"b"},
+                        "ext-plugin-post-req": {"c":"d"}
                     },
                     "upstream": {
                         "nodes": {
@@ -128,6 +128,10 @@ sending rpc type: 2 data length:
 receiving rpc type: 2 data length:
 sending rpc type: 2 data length:
 receiving rpc type: 2 data length:
+sending rpc type: 1 data length:
+receiving rpc type: 1 data length:
+sending rpc type: 1 data length:
+receiving rpc type: 1 data length:
 sending rpc type: 2 data length:
 receiving rpc type: 2 data length:
 sending rpc type: 2 data length:
@@ -256,6 +260,14 @@ sending rpc type: 1 data length:
 receiving rpc type: 1 data length:
 sending rpc type: 1 data length:
 receiving rpc type: 1 data length:
+sending rpc type: 1 data length:
+receiving rpc type: 1 data length:
+sending rpc type: 1 data length:
+receiving rpc type: 1 data length:
+sending rpc type: 1 data length:
+receiving rpc type: 1 data length:
+sending rpc type: 1 data length:
+receiving rpc type: 1 data length:
 --- error_log
 flush conf token lrucache
 --- no_error_log