Merge pull request #586 from 3scale/loading-cloud-hosted

fix issues failing to load APIcast Cloud Hosted policies
3scale · Feb 12, 2018 · e2e077f · e2e077f
2 parents 20dfaa5 + 5a41618
commit e2e077f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gateway/src/apicast/loader.lua b/gateway/src/apicast/loader.lua
@@ -52,10 +52,10 @@ end
 
 local function rename_loader(name, path)
   local new = map[name]
-  local found, err = loader(new, path)
+  local found, err = policy_searcher(new)
 
   if not found then
-    found = policy_searcher(new)
+    found = loader(new, path)
   end
 
   if found then

diff --git a/gateway/src/apicast/module.lua b/gateway/src/apicast/module.lua
@@ -34,7 +34,7 @@ local prequire = function(file)
   return ok, ret
 end
 
-local name = env.get('APICAST_MODULE') or 'apicast.policy.apicast'
+local name = env.value('APICAST_MODULE') or 'apicast.policy.apicast'
 
 local ok, mod = prequire(name)
 

diff --git a/gateway/src/apicast/policy/local_chain/local_chain.lua b/gateway/src/apicast/policy/local_chain/local_chain.lua
@@ -7,7 +7,7 @@ local _M = policy.new('Local Policy Chain')
 local function build_default_chain()
   local module
 
-  if resty_env.get('APICAST_MODULE') then
+  if resty_env.value('APICAST_MODULE') then
     -- Needed to keep compatibility with the old module system.
     module = assert(require('apicast.module'), 'could not load custom module')
   else