hiredis-client 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a09904c2b65564f3ae0f0d6b3291bdba8d45e1a374fde3ddef66bbeb5b18d6
-  data.tar.gz: f33ba8e3ac24c1f56e4a5986f386f7b69dda768f4ce6e57ad7f0c83038ea2340
+  metadata.gz: fc000cc925b26584a60d6a74360cf9b39db974e718c6be6af4f19f7e4ac77051
+  data.tar.gz: f54b30ef2a1310200d60d76e310a1ea750001affe145c0994a59e262934e6865
 SHA512:
-  metadata.gz: 2bc1dc250b4c8f3c94b3524f56f0331b13fabf39588a866fb47fc63c05beb5ac86902f477df76ccd6414305173eb99a0a554d8869096dd549c75c5cb7c2dcf7d
-  data.tar.gz: '029fe0fb5da33e2e6a9df5751354863f62abc70bab15ca4ed7132705fbe082333f56268a8c3ca82145c0465ed6a44ff069f7b05c932f47228672e1a84858730f'
+  metadata.gz: d386889884c0a22a1e44ed346f659aa8f95e74be3363ba891b2ac372efb3b02f18bc14e6ccbe347a6e6f3daae3d48cf376dcb10793272db96574233108157177
+  data.tar.gz: e5264e89206c6d5d723cc1b814867c0e9420ec1f904ca6596a23b840bcc2a0ffe3ae5e2ff9e1069e841eb61d3040d5e916a325a8bb1b325a6b7508261a2df224

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -480,7 +480,11 @@ static VALUE hiredis_connect_tcp(VALUE self, VALUE host, VALUE port) {
         redisFree(connection->context);
         connection->context = NULL;
     }
-    return hiredis_connect_finish(connection, redisConnectNonBlock(StringValuePtr(host), NUM2INT(port)));
+    redisContext *context = redisConnectNonBlock(StringValuePtr(host), NUM2INT(port));
+    if (context) {
+        redisEnableKeepAlive(context);
+    }
+    return hiredis_connect_finish(connection, context);
 }
 
 static VALUE hiredis_connect_unix(VALUE self, VALUE path) {

data/ext/redis_client/hiredis/vendor/hiredis.c

@@ -913,7 +913,7 @@ int redisSetTimeout(redisContext *c, const struct timeval tv) {
 
 /* Enable connection KeepAlive. */
 int redisEnableKeepAlive(redisContext *c) {
-    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
+    if (redisKeepAlive(c, REDIS_KEEPALIVE_TTL, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
         return REDIS_ERR;
     return REDIS_OK;
 }

data/ext/redis_client/hiredis/vendor/hiredis.h

@@ -87,6 +87,7 @@ typedef long long ssize_t;
 #define REDIS_NO_AUTO_FREE 0x200
 
 #define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
+#define REDIS_KEEPALIVE_TTL 120 /* seconds */
 
 /* number of times we retry to connect in the case of EADDRNOTAVAIL and
  * SO_REUSEADDR is being used. */

data/ext/redis_client/hiredis/vendor/net.c

@@ -162,7 +162,7 @@ static int redisSetBlocking(redisContext *c, int blocking) {
     return REDIS_OK;
 }
 
-int redisKeepAlive(redisContext *c, int interval) {
+int redisKeepAlive(redisContext *c, int ttl, int interval) {
     int val = 1;
     redisFD fd = c->fd;
 
@@ -171,28 +171,28 @@ int redisKeepAlive(redisContext *c, int interval) {
         return REDIS_ERR;
     }
 
-    val = interval;
-
 #if defined(__APPLE__) && defined(__MACH__)
+    val = ttl;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 #else
 #if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+    val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 
-    val = interval/3;
-    if (val == 0) val = 1;
+    val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 
-    val = 3;
+    val = (ttl / interval) - 1;
+    if (val <= 0) val = 1;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;

data/ext/redis_client/hiredis/vendor/net.h

@@ -48,7 +48,7 @@ int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
                                const struct timeval *timeout,
                                const char *source_addr);
 int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
+int redisKeepAlive(redisContext *c, int ttl, int interval);
 int redisCheckConnectDone(redisContext *c, int *completed);
 
 int redisSetTcpNoDelay(redisContext *c);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
 description:
 email:
 - jean.boussier@gmail.com
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Hiredis binding for redis-client