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

fix: ensure timeout not nil to avoid attempt to perform arithmetic on a nil value error #214

Merged
merged 4 commits into from
Apr 7, 2024
Merged

fix: ensure timeout not nil to avoid attempt to perform arithmetic on a nil value error #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf6b8e6
fix: ensure timeout not nil to avoid `attempt to perform arithmetic o…
nic-chen Apr 4, 2024
787b03e
ci: do not use the latest version of APISIX Base
nic-chen Apr 5, 2024
abdd3cf
fix: make ternary operator clear
nic-chen Apr 7, 2024
548dd61
address comments
nic-chen Apr 7, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
git clone https://github.com/openresty/test-nginx.git test-nginx
cd test-nginx && (sudo cpanm --notest . > build.log 2>&1 || (cat build.log && exit 1)) && cd ..

wget https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-base.sh
wget https://raw.githubusercontent.com/api7/apisix-build-tools/refs/tags/apisix-base/1.21.4.2.2/build-apisix-base.sh
chmod +x build-apisix-base.sh
OR_PREFIX=$OPENRESTY_PREFIX ./build-apisix-base.sh latest

Expand Down
3 changes: 2 additions & 1 deletion lib/resty/etcd/v3.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,8 @@ function refresh_jwt_token(self, timeout)
end

if self.requesting_token then
self.sema:wait(timeout)
local wait_timeout = timeout or self.timeout or 0
self.sema:wait(wait_timeout)
if self.jwt_token and now() - self.last_auth_time < 60 * 3 + random(0, 60) then
return true, nil
end
Expand Down
Loading