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.

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

change: remove deprecated lua_shared_dicts #7677

Merged
merged 1 commit into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions apisix/cli/ngx_tpl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,6 @@ http {
lua_shared_dict {*cache_key*} {*cache_size*};
{% end %}
{% end %}
{% if http.lua_shared_dicts then %}
{% for cache_key, cache_size in pairs(http.lua_shared_dicts) do %}
lua_shared_dict {*cache_key*} {*cache_size*};
{% end %}
{% end %}

{% if enabled_plugins["error-log-logger"] then %}
lua_capture_error_log 10m;
Expand Down
5 changes: 0 additions & 5 deletions apisix/cli/ops.lua
Original file line number Diff line number Diff line change
Expand Up @@ -651,11 +651,6 @@ Please modify "admin_key" in conf/config.yaml .
sys_conf["worker_processes"] = floor(tonumber(env_worker_processes))
end

if sys_conf["http"]["lua_shared_dicts"] then
stderr:write("lua_shared_dicts is deprecated, " ..
"use custom_lua_shared_dict instead\n")
end

local exported_vars = file.get_exported_vars()
if exported_vars then
if not sys_conf["envs"] then
Expand Down
16 changes: 0 additions & 16 deletions t/cli/test_http_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,6 @@ echo "passed: define custom shdict"

git checkout conf/config.yaml

echo '
nginx_config:
http:
lua_shared_dicts:
my_dict: 1m
' > conf/config.yaml

make init

if ! grep "lua_shared_dict my_dict 1m;" conf/nginx.conf > /dev/null; then
echo "failed: define custom shdict in the old way"
exit 1
fi

echo "passed: define custom shdict in the old way"

echo "
plugins:
- ip-restriction
Expand Down