hiredis-client 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834e7347f7934e084b79647b8a179f2297e9e3ef29fce477a0d4a7c76ed99989
-  data.tar.gz: 121469ded1e076737990f7c6ce1ec86666cf4194dca2707fd1fa5645b63c3d6d
+  metadata.gz: 4c30e3ee9498ead669c8f956cdd01a5f5c461af38a8eedaca5726622663d5284
+  data.tar.gz: '086288891e30a5b1966b60279af5eb7b3573a5cbb35ce64b974ca289a9eedbf1'
 SHA512:
-  metadata.gz: 8f67fbd4582aaadbe6d7a2da0ce68bf45a9a712914e270de8e97511af579905033bfa5aa83c6055a38771078be87cdbb36e0883f5be471cfb3feb92cc5363007
-  data.tar.gz: 114644f547ddf1c707f76b04d53a8876d06f075aa66056d7185edcd86143643307dd06265e5f7a1446af0f207ac7c547f07e5ff9799c8b69b1816e4735c6f266
+  metadata.gz: be4dd95865da29525ee3a6ce4b1cc8c7c3813e6589a3dc97a6270dc8bdbe99803cfe46c581ab4f255d2b9e8470e3dc9557d30061870c266197974703da5447f7
+  data.tar.gz: 17015559919a8008b8ad66cf743134f16cb91c19be7c97685faa0bb8a02b49dabdb66986eadc00269af61ace4e9ce62a0b336d0619d64fb56beccaa1364b75ff

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);
     }
 
@@ -602,14 +618,17 @@ static VALUE hiredis_flush(VALUE self) {
     return Qtrue;
 }
 
+
+#define HIREDIS_FATAL_CONNECTION_ERROR -1
+#define HIREDIS_CLIENT_TIMEOUT -2
+
 static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply) {
     void *redis_reply = NULL;
     int wdone = 0;
 
     /* Try to read pending replies */
     if (redisGetReplyFromReader(connection->context, &redis_reply) == REDIS_ERR) {
-        /* Protocol error */
-        return -1;
+        return HIREDIS_FATAL_CONNECTION_ERROR; // Protocol error
     }
 
     if (redis_reply == NULL) {
@@ -618,20 +637,19 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
             errno = 0;
 
             if (hiredis_buffer_write_nogvl(connection->context, &wdone) == REDIS_ERR) {
-                /* Socket error */
-                return -1;
+                return HIREDIS_FATAL_CONNECTION_ERROR; // Socket error
             }
 
             if (errno == EAGAIN) {
                 int writable = 0;
 
                 if (hiredis_wait_writable(connection->context->fd, &connection->write_timeout, &writable) < 0) {
-                    return -2;
+                    return HIREDIS_CLIENT_TIMEOUT;
                 }
 
                 if (!writable) {
                     errno = EAGAIN;
-                    return -2;
+                    return HIREDIS_CLIENT_TIMEOUT;
                 }
             }
         }
@@ -641,20 +659,19 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
             errno = 0;
 
             if (hiredis_buffer_read_nogvl(connection->context) == REDIS_ERR) {
-                /* Socket error */
-                return -1;
+                return HIREDIS_FATAL_CONNECTION_ERROR; // Socket error
             }
 
             if (errno == EAGAIN) {
                 int readable = 0;
 
                 if (hiredis_wait_readable(connection->context->fd, &connection->read_timeout, &readable) < 0) {
-                    return -2;
+                    return HIREDIS_CLIENT_TIMEOUT;
                 }
 
                 if (!readable) {
                     errno = EAGAIN;
-                    return -2;
+                    return HIREDIS_CLIENT_TIMEOUT;
                 }
 
                 /* Retry */
@@ -662,8 +679,7 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
             }
 
             if (redisGetReplyFromReader(connection->context, &redis_reply) == REDIS_ERR) {
-                /* Protocol error */
-                return -1;
+                return HIREDIS_FATAL_CONNECTION_ERROR; // Protocol error
             }
         }
     }
@@ -681,9 +697,19 @@ static VALUE hiredis_read(VALUE self) {
     ENSURE_CONNECTED(connection);
 
     VALUE reply = Qnil;
-    if (hiredis_read_internal(connection, &reply)) {
-        hiredis_raise_error_and_disconnect(connection, rb_eRedisClientReadTimeoutError);
+    switch (hiredis_read_internal(connection, &reply)) {
+        case HIREDIS_FATAL_CONNECTION_ERROR:
+            // The error is unrecoverable, we eagerly close the connection to ensure
+            // it won't be re-used.
+            hiredis_raise_error_and_disconnect(connection, rb_eRedisClientReadTimeoutError);
+            break;
+        case HIREDIS_CLIENT_TIMEOUT:
+            // The timeout might have been expected (e.g. `PubSub#next_event`).
+            // we let the caller decide if the connection should be closed.
+            rb_raise(rb_eRedisClientReadTimeoutError, "Unknown Error");
+            break;
     }
+
     if (reply == Redis_Qfalse) {
         // See reply_create_bool
         reply = Qfalse;

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.11.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-11-01 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.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 description:
 email:
 - jean.boussier@gmail.com