diff --git a/apicast/src/executor.lua b/apicast/src/executor.lua index dff8e33be..d3989e72d 100644 --- a/apicast/src/executor.lua +++ b/apicast/src/executor.lua @@ -4,12 +4,6 @@ -- when calling the policy chain methods. This 'context' contains information -- shared among policies. -local resty_env = require('resty.env') - -if resty_env.get('APICAST_MODULE') then - return require('module') -end - local policy_chain = require('policy_chain') local policy = require('policy') local linked_list = require('linked_list') diff --git a/apicast/src/policy/local_chain.lua b/apicast/src/policy/local_chain.lua index 9c38cae22..00b1695e2 100644 --- a/apicast/src/policy/local_chain.lua +++ b/apicast/src/policy/local_chain.lua @@ -1,8 +1,23 @@ +local resty_env = require('resty.env') + local policy = require('policy') local Proxy = require('proxy') local _M = policy.new('Local Policy Chain') -local default_chain = require('policy_chain').build({ 'apicast' }) +local function build_default_chain() + local module + + if resty_env.get('APICAST_MODULE') then + -- Needed to keep compatibility with the old module system. + module = 'module' + else + module = 'apicast' + end + + return require('policy_chain').build({ module }) +end + +local default_chain = build_default_chain() local function find_policy_chain(context) return context.policy_chain or (context.service and context.service.policy_chain) or default_chain