Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Introduce APICAST_LUA_SOCKET_KEEPALIVE_REQUESTS environment variable" #1504

Merged
merged 2 commits into from
Nov 6, 2024
+3 −36
Merged

Revert "Introduce APICAST_LUA_SOCKET_KEEPALIVE_REQUESTS environment variable" #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a845a3f
Revert "Introduce APICAST_LUA_SOCKET_KEEPALIVE_REQUESTS environment v…
tkan145 Nov 6, 2024
17f28b4
Update Roverfile.lock
tkan145 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Upstream TLS v1.3 [PR #1400](https://github.com/3scale/APIcast/pull/1400) [THREESCALE-9193](https://issues.redhat.com/browse/THREESCALE-9193)
- Updated policy list for v3.13.2 [PR #1404](https://github.com/3scale/APIcast/pull/1404)
- Updated policy list for v3.14.0 [PR #1407](https://github.com/3scale/APIcast/pull/1407)
- Add `APICAST_LUA_SOCKET_KEEPALIVE_REQUESTS` to limit the number of requests a single keepalive socket can handle [PR #1496](https://github.com/3scale/APIcast/pull/1496) [THREESCALE-11321](https://issues.redhat.com/browse/THREESCALE-11321)

### Removed

Expand Down
4 changes: 2 additions & 2 deletions doc/build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ APIcast is an application based on [OpenResty](https://openresty.org/en/). APIca

## Release

APIcast is released as [Docker image](https://docs.docker.com).
APIcast is released as [Docker image](https://docs.docker.com/engine/tutorials/dockerimages/).

## Dependencies

APIcast uses LuaRocks, the package manager for Lua modules, to install dependencies. With a correct configuration, LuaRocks installs dependencies into the correct path where OpenResty can see them.
APIcast uses LuaRocks, the package manager for Lua modules, to install dependencies. With a correct configuration, LuaRocks installs dependencies into the correct path where OpenResty can see them.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
APIcast uses LuaRocks, the package manager for Lua modules, to install dependencies. With a correct configuration, LuaRocks installs dependencies into the correct path where OpenResty can see them.
APIcast uses LuaRocks, the package manager for Lua modules, to install dependencies. With the proper configuration, LuaRocks installs dependencies into the path accessible to OpenResty.


For Docker images, LuaRocks is installed into the application folder. Then, `luarocks path` adds the application folder to the load path.

Expand Down
10 changes: 0 additions & 10 deletions doc/parameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,16 +478,6 @@ connections.
By default Gateway does not enable it, and the keepalive timeout on nginx is set
to [75 seconds](http://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout)

### `APICAST_LUA_SOCKET_KEEPALIVE_REQUESTS`

**Value:** positive integers
**Example:** "1"

Sets the maximum number of requests that one keepalive connection can serve.
After reaching the limit, the connection closes.

NOTE: This value affects connections opened by APIcast and will not have any
impact on requests proxied via APIcast.

### `APICAST_CACHE_STATUS_CODES`

Expand Down
2 changes: 1 addition & 1 deletion gateway/Roverfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ net-url 1.1-1||testing
nginx-lua-prometheus 0.20181120-3||production
penlight 1.13.1-1||production,development,testing
router 2.1-0||production
say 1.4.1-3||testing
say 1.4.1-3||testing
22 changes: 0 additions & 22 deletions gateway/src/resty/resolver/http.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ local resty_resolver = require 'resty.resolver'
local round_robin = require 'resty.balancer.round_robin'

local setmetatable = setmetatable
local resty_env = require 'resty.env'
local tonumber = tonumber
local keepalive_request = resty_env.get('APICAST_LUA_SOCKET_KEEPALIVE_REQUESTS')

local _M = setmetatable({}, { __index = resty_http })

Expand Down Expand Up @@ -55,23 +52,4 @@ function _M.connect(self, host, port, ...)
return ok, err
end

function _M:set_keepalive()
if keepalive_request then
local count, err = resty_http.get_reused_times(self)
if err then
return nil, err
end
if count >= tonumber(keepalive_request) then
resty_http.close(self)
return true
end
end

local ok, err = resty_http.set_keepalive(self)
if not ok then
return nil, err
end
return true
end

return _M
Loading