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

feat: use luasocket instead of curl in etcd.lua #2965

Merged
merged 7 commits into from
Jan 7, 2021
Merged

feat: use luasocket instead of curl in etcd.lua #2965

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83df02b
feat: use luasocket instead of curl in etcd.lua (#2818)
starsz Dec 22, 2020
edd1a31
update: fix ci
starsz Dec 23, 2020
d731433
update: fix test
starsz Dec 23, 2020
7429657
update: fix test
starsz Dec 23, 2020
02cc565
update: fix test
starsz Dec 23, 2020
2ffba56
update: enrich request comment
starsz Dec 24, 2020
2f9106b
update: fix etcd error handle
starsz Dec 25, 2020
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
Prev Previous commit
Next Next commit
update: enrich request comment
  • Loading branch information
@starsz
starsz committed Dec 24, 2020
commit 2ffba5684e20bb24bbac1c9d8fb11c6ce2e5a932
7 changes: 6 additions & 1 deletion apisix/cli/etcd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ function _M.init(env, show_output)
local errmsg

local res, err = http.request(version_url)
Copy link
Member

Choose a reason for hiding this comment

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

Look like this library doesn't support max-timeout? Only operation level timeout is supported.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right. The library doesn't support max-timeout.

-- In case of failure, request returns nil followed by an error message.
-- Else the first return value is the response body
-- and followed by the response status code.
if err and type(err) == "string" then
errmsg = str_format("request etcd endpoint \'%s\' error, %s\n", version_url, err)
util.die(errmsg)
Expand Down Expand Up @@ -180,7 +183,9 @@ function _M.init(env, show_output)
source = ltn12.source.string(post_json_auth),
sink = ltn12.sink.table(response_body),
headers = {["Content-Length"] = #post_json_auth}}
-- err is string type
-- In case of failure, request returns nil followed by an error message.
-- Else the first return value is just the number 1
Copy link
Member

Choose a reason for hiding this comment

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

The first return value isn't the response body?

Copy link
Contributor Author

@starsz starsz Dec 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Yep. It has two forms.
You can see more details about it.

In case of failure, the function returns nil followed by an error message. If successful, the simple form returns the response body as a string, followed by the response status code, the response headers and the response status line. The generic function returns the same information, except the first return value is just the number 1 (the body goes to the sink).

http://w3.impa.br/~diego/software/luasocket/http.html

Copy link
Member

Choose a reason for hiding this comment

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

Got it

-- and followed by the response status code.
if err and type(err) == "string" then
Copy link
Member

Choose a reason for hiding this comment

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

Better to add more info about the err handle, so that people can know what you are doing without looking into luasocket's doc.

Copy link
Contributor Author

@starsz starsz Dec 24, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

@spacewander Sorry, I can't get your point.
That we need to distinguish the connection refused and timeout

Copy link
Member

Choose a reason for hiding this comment

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

I mean, why we need to check the type of err? We need to clarify it in the comment, so that people can know it without searching luasocket's doc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK. I got it now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

Copy link
Member

@spacewander spacewander Dec 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

I think it would be better to use if not res then handle err? Since the first argument is nil when error happened. This way is more normal.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well. Agree with you.

errmsg = str_format("request etcd endpoint \"%s\" error, %s\n", auth_url, err)
util.die(errmsg)
Expand Down