hiredis-client 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ab993c8bd2fc54e8817b047d657409ee3cf3ab8256884c052358cf4178d2835
-  data.tar.gz: 49298a0eedee98b454ece01d08de52d68291383ceccc5146f129cab4f2d87095
+  metadata.gz: 4c30e3ee9498ead669c8f956cdd01a5f5c461af38a8eedaca5726622663d5284
+  data.tar.gz: '086288891e30a5b1966b60279af5eb7b3573a5cbb35ce64b974ca289a9eedbf1'
 SHA512:
-  metadata.gz: 1994b4d87d9b0ca699f4ab9a1b35d7f58834e1186ce8df4dbb57958b4a3a4e7db5379efa9e27c62ab01245c8d354babdd9a173234eaebfbb6e2187b8910ad419
-  data.tar.gz: 8bdfe9124ab8b8b491bd90b5effef54465bcf512c18fefe84c8af83dad396306d5cbd88e02ce84fd9db6835766bdbbcb055a2b3cc52a33cf149decbd802736f6
+  metadata.gz: be4dd95865da29525ee3a6ce4b1cc8c7c3813e6589a3dc97a6270dc8bdbe99803cfe46c581ab4f255d2b9e8470e3dc9557d30061870c266197974703da5447f7
+  data.tar.gz: 17015559919a8008b8ad66cf743134f16cb91c19be7c97685faa0bb8a02b49dabdb66986eadc00269af61ace4e9ce62a0b336d0619d64fb56beccaa1364b75ff

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -618,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) {
@@ -634,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;
                 }
             }
         }
@@ -657,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 */
@@ -678,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
             }
         }
     }
@@ -697,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;

metadata

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