Skip to content

Commit

Permalink
Merge pull request #503 from 3scale/improve-loading
Browse files Browse the repository at this point in the history
fix rover loading code
  • Loading branch information
mikz authored Nov 28, 2017
2 parents f035569 + 36f482d commit de0701f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- Namespace all APIcast code in `apicast` folder. Possible BREAKING CHANGE for some customizations. [PR #486](https://github.com/3scale/apicast/pull/486)

## Fixed

- Loading installed luarocks from outside rover [PR #503](https://github.com/3scale/apicast/pull/503)

## [3.2.0-alpha1]

## Added
Expand Down
3 changes: 3 additions & 0 deletions gateway/bin/cli
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
local ok, setup = pcall(require, 'rover.setup')

if ok then
-- preload apicast before openresty lua paths are removed
require('apicast.executor')

setup()
else
package.path = './src/?.lua;' .. package.path
Expand Down
2 changes: 0 additions & 2 deletions gateway/http.d/init.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ init_by_lua_block {
-- require('jit.p').start('vl')
-- require('jit.dump').start('bsx', 'jit.log')

pcall(require, 'luarocks.loader')

require("resty.core")
require('resty.resolver').init()

Expand Down

0 comments on commit de0701f

Please sign in to comment.