Added set_keepalive and tests

Author: pintsized

lib/resty/redis/connector.lua

@@ -89,6 +89,7 @@ local DEFAULTS = setmetatable({
     connect_timeout = 100,
     read_timeout = 1000,
     connection_options = {}, -- pool, etc
+
     keepalive_timeout = 60000,
     keepalive_poolsize = 30,
 
@@ -315,4 +316,17 @@ function _M.connect_to_host(self, host)
 end
 
 
+local function set_keepalive(self, redis)
+    -- Restore connection to "NORMAL" before putting into keepalive pool,
+    -- ignoring any errors.
+    redis:discard()
+
+    local config = self.config
+    return redis:set_keepalive(
+        config.keepalive_timeout, config.keepalive_poolsize
+    )
+end
+_M.set_keepalive = set_keepalive
+
+
 return _M

t/config.t

@@ -70,12 +70,15 @@ location /t {
             connect_timeout = 500,
             port = 6380,
             db = 6,
+            keepalive_poolsize = 10,
         })
 
         assert(config ~= rc.config, "config should not equal rc.config")
         assert(rc.config.connect_timeout == 500, "connect_timeout should be 500")
         assert(rc.config.db == 6, "db should be 6")
         assert(rc.config.role == "master", "role should be master")
+        assert(rc.config.keepalive_poolsize == 10,
+            "keepalive_poolsize should be 10")
 
         local redis = assert(rc:connect({ port = 6379 }),
             "rc:connect should return positively")

t/connector.t

@@ -1,9 +1,7 @@
 use Test::Nginx::Socket::Lua;
 use Cwd qw(cwd);
 
-repeat_each(2);
-
-plan tests => repeat_each() * (3 * blocks());
+plan tests => repeat_each() * (3 * blocks() - 1);
 
 my $pwd = cwd();
 
@@ -181,3 +179,36 @@ null
 an animal
 --- no_error_log
 [error]
+
+
+=== TEST 5: Test set_keepalive method
+--- http_config eval: $::HttpConfig
+--- config
+location /t {
+    lua_socket_log_errors Off;
+    content_by_lua_block {
+        local rc = require("resty.redis.connector").new()
+
+        local redis = assert(rc:connect(),
+            "rc:connect should return positively")
+        local ok, err = rc:set_keepalive(redis)
+        assert(not err, "set_keepalive error should be nil")
+
+        local ok, err = redis:set("foo", "bar")
+        assert(not ok, "ok should be nil")
+        assert(string.find(err, "closed"), "error should contain 'closed'")
+
+        local redis = assert(rc:connect(), "connect should return positively")
+        assert(redis:subscribe("channel"), "subscribe should return positively")
+
+        local ok, err = rc:set_keepalive(redis)
+        assert(not ok, "ok should be nil")
+        assert(string.find(err, "subscribed state"),
+            "error should contain 'subscribed state'")
+
+    }
+}
+--- request
+GET /t
+--- no_error_log
+[error]