Move require_serializer into v3

* Fix #126 * cause to conform to v3.md Signed-off-by: u5surf <[email protected]>
api7 · Oct 11, 2022 · 8ae9737 · 8ae9737
1 parent 29de8bd
commit 8ae9737
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/resty/etcd.lua b/lib/resty/etcd.lua
@@ -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
@@ -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)

diff --git a/lib/resty/etcd/v3.lua b/lib/resty/etcd/v3.lua
@@ -27,6 +27,8 @@ 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 require = require
+local pcall   = pcall
 
 math.randomseed(now() * 1000 + ngx.worker.pid())
 
@@ -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
@@ -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