hiredis-client 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834e7347f7934e084b79647b8a179f2297e9e3ef29fce477a0d4a7c76ed99989
-  data.tar.gz: 121469ded1e076737990f7c6ce1ec86666cf4194dca2707fd1fa5645b63c3d6d
+  metadata.gz: 8ab993c8bd2fc54e8817b047d657409ee3cf3ab8256884c052358cf4178d2835
+  data.tar.gz: 49298a0eedee98b454ece01d08de52d68291383ceccc5146f129cab4f2d87095
 SHA512:
-  metadata.gz: 8f67fbd4582aaadbe6d7a2da0ce68bf45a9a712914e270de8e97511af579905033bfa5aa83c6055a38771078be87cdbb36e0883f5be471cfb3feb92cc5363007
-  data.tar.gz: 114644f547ddf1c707f76b04d53a8876d06f075aa66056d7185edcd86143643307dd06265e5f7a1446af0f207ac7c547f07e5ff9799c8b69b1816e4735c6f266
+  metadata.gz: 1994b4d87d9b0ca699f4ab9a1b35d7f58834e1186ce8df4dbb57958b4a3a4e7db5379efa9e27c62ab01245c8d354babdd9a173234eaebfbb6e2187b8910ad419
+  data.tar.gz: 8bdfe9124ab8b8b491bd90b5effef54465bcf512c18fefe84c8af83dad396306d5cbd88e02ce84fd9db6835766bdbbcb055a2b3cc52a33cf149decbd802736f6

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -311,14 +311,28 @@ static VALUE hiredis_alloc(VALUE klass) {
     return TypedData_Make_Struct(klass, hiredis_connection_t, &hiredis_connection_data_type, connection);
 }
 
+void redis_set_io_error(redisContext *context, int err) {
+    if (err) {
+        errno = err;
+    }
+    context->err = REDIS_ERR_IO;
+    (void)!strerror_r(errno, context->errstr, sizeof(context->errstr));
+}
+
 static inline void redis_raise_error_and_disconnect(redisContext *context, VALUE timeout_error) {
     if (!context) return;
 
     int err = context->err;
     char errstr[128];
-    MEMCPY(context->errstr, errstr, char, 128);
+    if (context->err) {
+      strncpy(errstr, context->errstr, 128);
+    }
     redisFree(context);
 
+    if (!err) {
+      rb_raise(timeout_error, "Unknown Error");
+    }
+
     // OpenSSL bug: The SSL_ERROR_SYSCALL with errno value of 0 indicates unexpected EOF from the peer.
     if (errno == EAGAIN || (err == REDIS_ERR_IO && errno == 0)) {
         errno = 0;
@@ -431,26 +445,28 @@ static VALUE hiredis_connect_finish(hiredis_connection_t *connection, redisConte
 
     int writable = 0;
     int optval = 0;
+    errno = 0;
     socklen_t optlen = sizeof(optval);
 
     /* Wait for socket to become writable */
     if (hiredis_wait_writable(context->fd, &connection->connect_timeout, &writable) < 0) {
+        redis_set_io_error(context, ETIMEDOUT);
         redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     if (!writable) {
-        errno = ETIMEDOUT;
+        redis_set_io_error(context, ETIMEDOUT);
         redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     /* Check for socket error */
     if (getsockopt(context->fd, SOL_SOCKET, SO_ERROR, &optval, &optlen) < 0) {
-        context->err = REDIS_ERR_IO;
+        redis_set_io_error(context, 0);
         redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 
     if (optval) {
-        errno = optval;
+        redis_set_io_error(context, optval);
         redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
     }
 

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

@@ -935,8 +935,9 @@ int redisBufferRead(redisContext *c) {
     int nread;
 
     /* Return early when the context has seen an error. */
-    if (c->err)
+    if (c->err) {
         return REDIS_ERR;
+    }
 
     nread = c->funcs->read(c, buf, sizeof(buf));
     if (nread > 0) {

data/lib/redis_client/hiredis_connection.rb

@@ -41,7 +41,12 @@ class RedisClient
           raise CannotConnectError, error.message, error.backtrace
         end
       else
-        connect_tcp(config.host, config.port)
+        begin
+          connect_tcp(config.host, config.port)
+        rescue SystemCallError => error
+          error_code = error.class.name.split("::").last
+          raise CannotConnectError, "Failed to connect to #{config.host}:#{config.port} (#{error_code})"
+        end
       end
 
       if config.ssl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-10-10 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.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 description:
 email:
 - jean.boussier@gmail.com