Skip to content

Move require_serializer into v3 #176

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

Open
u5surf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move require_serializer into v3 #176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
505a445
fix: move require_serializer into v3
u5surf Oct 11, 2022
2ef8c64
test: add etcd.v3 serialize case
u5surf Oct 12, 2022
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
Next Next commit
fix: move require_serializer into v3 
* Fix #126
* cause to conform to v3.md

Signed-off-by: u5surf <[email protected]>
  • Loading branch information
@u5surf
u5surf committed Oct 12, 2022
commit 505a4459872d8ff579649a50db8dbd788fbc4b28
15 changes: 1 addition & 14 deletions lib/resty/etcd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
local etcdv3 = require("resty.etcd.v3")
local typeof = require("typeof")
local require = require
local pcall = pcall

local _M = {version = 0.9}


local function require_serializer(serializer_name)
if serializer_name then
local ok, module = pcall(require, "resty.etcd.serializers." .. serializer_name)
if ok then
return module
end
end

return require("resty.etcd.serializers.json")
end

function _M.new(opts)
opts = opts or {}
if not typeof.table(opts) then
Expand All @@ -33,7 +20,7 @@ function _M.new(opts)
opts.ttl = opts.ttl or -1

local serializer_name = typeof.string(opts.serializer) and opts.serializer
opts.serializer = require_serializer(serializer_name)
opts.serializer = serializer_name
opts.api_prefix = "/v3"

return etcdv3.new(opts)
Expand Down
15 changes: 14 additions & 1 deletion lib/resty/etcd/v3.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
-- https://github.com/ledgetech/lua-resty-http
local require = require
local split = require("ngx.re").split
local typeof = require("typeof")
local cjson = require("cjson.safe")
Expand Down Expand Up @@ -27,6 +28,7 @@ local decode_base64 = ngx.decode_base64
local semaphore = require("ngx.semaphore")
local health_check = require("resty.etcd.health_check")
local pl_path = require("pl.path")
local pcall = pcall

math.randomseed(now() * 1000 + ngx.worker.pid())

Expand Down Expand Up @@ -265,6 +267,17 @@ local function serialize_and_encode_base64(serialize_fn, data)
return encode_base64(data)
end

local function require_serializer(serializer_name)
if serializer_name then
local ok, module = pcall(require, "resty.etcd.serializers." .. serializer_name)
if ok then
return module
end
end

return require("resty.etcd.serializers.json")
end


function _M.new(opts)
local timeout = opts.timeout
Expand All @@ -278,7 +291,7 @@ function _M.new(opts)
if ssl_verify == nil then
ssl_verify = true
end
local serializer = opts.serializer
local serializer = require_serializer(opts.serializer)
local extra_headers = opts.extra_headers
local sni = opts.sni
local unix_socket_proxy = opts.unix_socket_proxy
Expand Down