changed parameter precedence, so that dsn parsed params fill in gaps of

other params, rather than the other way around

Author: pintsized

lib/resty/redis/connector.lua

@@ -130,25 +130,6 @@ local _M = {
 local mt = { __index = _M }
 
 
-function _M.new(config)
-    local ok, config = pcall(tbl_copy_merge_defaults, config, DEFAULTS)
-    if not ok then
-        return nil, config  -- err
-    else
-        -- In proxied Redis mode disable default commands
-        if config.connection_is_proxied == true and
-            not next(config.disabled_commands) then
-
-            config.disabled_commands = default_disabled_commands
-        end
-
-        return setmetatable({
-            config = setmetatable(config, fixed_field_metatable)
-        }, mt)
-    end
-end
-
-
 local function parse_dsn(params)
     local url = params.url
     if url and url ~= "" then
@@ -172,27 +153,56 @@ local function parse_dsn(params)
 
         local roles = { m = "master", s = "slave", a = "any" }
 
+        local parsed_params = {}
+
         for i,v in ipairs(fields) do
-            params[v] = m[i + 1]
+            parsed_params[v] = m[i + 1]
             if v == "role" then
-                params[v] = roles[params[v]]
+                parsed_params[v] = roles[parsed_params[v]]
             end
         end
-    end
 
-    return true, nil
+        return tbl_copy_merge_defaults(params, parsed_params)
+    end
 end
 _M.parse_dsn = parse_dsn
 
 
-function _M.connect(self, params)
-    local params = tbl_copy_merge_defaults(params, self.config)
+function _M.new(config)
+    -- Fill out gaps in config with any dsn params
+    if config and config.url then
+        local err
+        config, err = parse_dsn(config)
+        if not ok then ngx_log(ngx_ERR, err) end
+    end
+
+    local ok, config = pcall(tbl_copy_merge_defaults, config, DEFAULTS)
+    if not ok then
+        return nil, config  -- err
+    else
+        -- In proxied Redis mode disable default commands
+        if config.connection_is_proxied == true and
+            not next(config.disabled_commands) then
 
-    if params.url then
-        local ok, err = parse_dsn(params)
+            config.disabled_commands = default_disabled_commands
+        end
+
+        return setmetatable({
+            config = setmetatable(config, fixed_field_metatable)
+        }, mt)
+    end
+end
+
+
+function _M.connect(self, params)
+    if params and params.url then
+        local err
+        params, err = parse_dsn(params)
         if not ok then ngx_log(ngx_ERR, err) end
     end
 
+    params = tbl_copy_merge_defaults(params, self.config)
+
     if #params.sentinels > 0 then
         return self:connect_via_sentinel(params)
     else

t/connector.t

@@ -223,8 +223,8 @@ location /t {
             path = "unix://tmp/redis.sock",
         }):connect()
 
-		assert(not redis and err == "no such file or directory",
-			"bad domain socket should fail")
+        assert(not redis and err == "no such file or directory",
+            "bad domain socket should fail")
     }
 }
 --- request
@@ -241,13 +241,13 @@ location /t {
     content_by_lua_block {
         local rc = require("resty.redis.connector")
 
-		local params = {
-			url = "redis://foo@127.0.0.1:$TEST_NGINX_REDIS_PORT/4"
-		}
+        local user_params = {
+            url = "redis://foo@127.0.0.1:$TEST_NGINX_REDIS_PORT/4"
+        }
 
-		local ok, err = rc.parse_dsn(params)
-		assert(ok and not err,
-			"url should parse without error: " .. tostring(err))
+        local params, err = rc.parse_dsn(user_params)
+        assert(params and not err,
+            "url should parse without error: " .. tostring(err))
 
 		assert(params.host == "127.0.0.1", "host should be localhost")
 		assert(tonumber(params.port) == $TEST_NGINX_REDIS_PORT,
@@ -256,12 +256,12 @@ location /t {
 		assert(params.password == "foo", "password should be foo")
 
 
-		local params = {
+		local user_params = {
 			url = "sentinel://foo@foomaster:s/2"
 		}
 
-		local ok, err = rc.parse_dsn(params)
-		assert(ok and not err,
+		local params, err = rc.parse_dsn(user_params)
+		assert(params and not err,
 			"url should parse without error: " .. tostring(err))
 
 		assert(params.master_name == "foomaster", "master_name should be foomaster")
@@ -282,3 +282,81 @@ location /t {
 GET /t
 --- no_error_log
 [error]
+
+
+=== TEST 9: params override dsn components
+--- http_config eval: $::HttpConfig
+--- config
+location /t {
+    lua_socket_log_errors Off;
+    content_by_lua_block {
+        local rc = require("resty.redis.connector")
+
+        local user_params = {
+            url = "redis://foo@127.0.0.1:6381/4",
+            db = 2,
+            password = "bar",
+            host = "example.com",
+        }
+
+        local params, err = rc.parse_dsn(user_params)
+        assert(params and not err,
+            "url should parse without error: " .. tostring(err))
+
+        assert(tonumber(params.db) == 2, "db should be 2")
+        assert(params.password == "bar", "password should be bar")
+        assert(params.host == "example.com", "host should be example.com")
+
+        assert(tonumber(params.port) == 6381, "ort should still be 6381")
+
+    }
+}
+--- request
+GET /t
+--- no_error_log
+[error]
+
+
+=== TEST 9: Integration test for parse_dsn
+--- http_config eval: $::HttpConfig
+--- config
+location /t {
+    lua_socket_log_errors Off;
+    content_by_lua_block {
+        local user_params = {
+            url = "redis://foo.example:$TEST_NGINX_REDIS_PORT/4",
+            db = 2,
+            host = "127.0.0.1",
+        }
+
+        local rc, err = require("resty.redis.connector").new(user_params)
+        assert(rc and not err, "new should return positively")
+
+        local redis, err = rc:connect()
+        assert(redis and not err, "connect should return positively")
+        assert(redis:set("cat", "dog") and redis:get("cat") == "dog")
+
+        local redis, err = rc:connect({
+            url = "redis://foo.example:$TEST_NGINX_REDIS_PORT/4",
+            db = 2,
+            host = "127.0.0.1",
+        })
+        assert(redis and not err, "connect should return positively")
+        assert(redis:set("cat", "dog") and redis:get("cat") == "dog")
+
+
+        local rc2, err = require("resty.redis.connector").new()
+        local redis, err = rc2:connect({
+            url = "redis://foo.example:$TEST_NGINX_REDIS_PORT/4",
+            db = 2,
+            host = "127.0.0.1",
+        })
+        assert(redis and not err, "connect should return positively")
+        assert(redis:set("cat", "dog") and redis:get("cat") == "dog")
+
+    }
+}
+--- request
+GET /t
+--- no_error_log
+[error]