iodine 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae7877010acc419eed5fe07927ba5bbe3a58c4d
-  data.tar.gz: af9499644636b46887940f5328f0204f1f654e42
+  metadata.gz: 375dff05d190f0bd67e614a7e17ca4f260e94931
+  data.tar.gz: 40214b68ddd02635863435bd25aa513165815733
 SHA512:
-  metadata.gz: 30225e2179f074851eeb497a03e57a1d7e142b6f85c367b28efd99a4af3f4648fef1655a0fe599de95c05826931c726d4dc2fc4fa02597efce065b51d380a755
-  data.tar.gz: 9b28f309443e33f15ea48993ba4ff8a74c83580ad2a24957c2678b4bca333f5c50e011673613f13bc7f8f8434366e043b48d648e999a0c44e9518a9e6450370d
+  metadata.gz: 7d65d83cb40603cb233af7be43ed1eed8151dc3530acf850b112583a06e77c026c9415e70ad4daeffe8c513a5164cdb2eddead101d35c08c2ffb60cbcae69d8a
+  data.tar.gz: 1910c42c7e776bd60cb564df4a09f7235a002833420cc81bcc5b17d14e3b70b7f78eaa685fbcd85058e552c249ae767bec7d3caf00478fa30979b1b146746ccb

data/CHANGELOG.md

@@ -8,6 +8,14 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
+#### Change log v.0.4.2
+
+**Fix**: fixed an issue where Websocket `ping` timeouts were being ignored for the default `Iodine::Rack` server, causing the default (40 seconds) to persist over specified valued.
+
+**Fix**: fixed a possible issue with highjacking which might cause the server to hang.
+
+***
+
 #### Change log v.0.4.1
 
 **Fix**: postpone warmup in fear of abuse and collisions when using `fork`. i.e., during warmup, an application might perform actions that conflict with `fork` and worker initialization, such as creating a database connection pool during warmup, or maybe spawning a thread. Now `warmup` is postponed until *after* worker processes are up and running, resulting in a per-process warmup rather than a per-cluster warmup.

data/ext/iodine/fio_dict.c

@@ -1,5 +1,5 @@
 /*
-Copyright: Boaz segev, 2016-2017
+Copyright: Boaz segev, 2017
 License: MIT
 
 Feel free to copy, use and enjoy according to the license provided.

data/ext/iodine/iodine.c

@@ -286,7 +286,7 @@ static int iodine_review_rack_app(void) {
   rb_hash_aset(opt, ID2SYM(rb_intern("public")),
                rb_ivar_get(rack, rb_intern("@public")));
   rb_hash_aset(opt, ID2SYM(rb_intern("ping")),
-               rb_ivar_get(rack, rb_intern("@ping")));
+               rb_ivar_get(rack, rb_intern("@ws_timeout")));
   rb_hash_aset(opt, ID2SYM(rb_intern("timeout")),
                rb_ivar_get(rack, rb_intern("@ws_timeout")));
   if (rb_funcall2(Iodine, rb_intern("listen2http"), 1, &opt) == Qfalse)

data/ext/iodine/redis_connection.c

@@ -152,8 +152,8 @@ static void redis_on_data(intptr_t uuid, protocol_s *pr) {
       continue; /* while loop */
     }
     if (msg) {
-      if (!r->authenticated) {
-        r->authenticated = 1;
+      if (r->authenticated) {
+        r->authenticated--;
         if (msg->type != RESP_OK) {
           if (msg->type == RESP_ERR) {
             fprintf(stderr,
@@ -210,6 +210,7 @@ static void redis_on_open(intptr_t uuid, protocol_s *pr, void *d) {
   redis_protocol_s *r = (void *)pr;
   facil_set_timeout(uuid, r->settings->ping);
   if (r->settings->auth) {
+    r->authenticated = 1;
     size_t n_len = ul2a(NULL, r->settings->auth_len);
     char *t =
         malloc(r->settings->auth_len + 20 + n_len); /* 19 is probably enough */
@@ -225,7 +226,7 @@ static void redis_on_open(intptr_t uuid, protocol_s *pr, void *d) {
                 .length = (19 + n_len + r->settings->auth_len), .move = 1);
 
   } else
-    r->authenticated = 1;
+    r->authenticated = 0;
   r->settings->on_open(uuid, r->settings->udata);
   (void)d;
 }

data/ext/iodine/redis_engine.c

@@ -341,6 +341,26 @@ pubsub_engine_s *redis_engine_create(struct redis_engine_create_args a) {
   return (pubsub_engine_s *)e;
 }
 
+/**
+See the {pubsub.h} file for documentation about engines.
+
+function names speak for themselves ;-)
+*/
+void redis_engine_destroy(pubsub_engine_s *engine) {
+  redis_engine_s *r = (redis_engine_s *)engine;
+
+  spn_lock(&r->lock);
+  callbacks_s *cb;
+  fio_list_for_each(callbacks_s, node, cb, r->callbacks) free(cb);
+  sock_force_close(r->pub);
+  sock_force_close(r->sub);
+
+  r->active = 0;
+  if (dealloc_engine(r))
+    return;
+  spn_unlock(&r->lock);
+}
+
 /* *****************************************************************************
 Sending Data
 ***************************************************************************** */
@@ -376,23 +396,3 @@ intptr_t redis_engine_send(pubsub_engine_s *e, resp_object_s *data,
   schedule_pub_send(r, r->pub);
   return 0;
 }
-
-/**
-See the {pubsub.h} file for documentation about engines.
-
-function names speak for themselves ;-)
-*/
-void redis_engine_destroy(pubsub_engine_s *engine) {
-  redis_engine_s *r = (redis_engine_s *)engine;
-
-  spn_lock(&r->lock);
-  callbacks_s *cb;
-  fio_list_for_each(callbacks_s, node, cb, r->callbacks) free(cb);
-  sock_force_close(r->pub);
-  sock_force_close(r->sub);
-
-  r->active = 0;
-  if (dealloc_engine(r))
-    return;
-  spn_unlock(&r->lock);
-}

data/ext/iodine/sock.c

@@ -990,13 +990,15 @@ ssize_t sock_flush(intptr_t uuid) {
   if (validate_uuid(uuid) || !fdinfo(fd).open)
     return -1;
   ssize_t ret;
+  uint8_t touch = 0;
   lock_fd(fd);
   sock_rw_hook_s *rw;
 retry:
   rw = fdinfo(fd).rw_hooks;
   unlock_fd(fd);
   while ((ret = rw->flush(fd)) > 0)
-    ;
+    if (ret > 0)
+      touch = 1;
   if (ret == -1) {
     if (errno == EINTR)
       goto retry;
@@ -1008,7 +1010,7 @@ retry:
   lock_fd(fd);
   while (fdinfo(fd).packet && (ret = fdinfo(fd).packet->metadata.write_func(
                                    fd, fdinfo(fd).packet)) > 0)
-    ;
+    touch = 1;
   if (ret == -1) {
     if (errno == EINTR)
       goto retry;
@@ -1021,7 +1023,8 @@ retry:
     goto error;
 finish:
   unlock_fd(fd);
-  sock_touch(uuid);
+  if (touch)
+    sock_touch(uuid);
   return 0;
 error:
   unlock_fd(fd);
@@ -1037,7 +1040,8 @@ error:
 after all the data was sent. This is a "busy" wait, polling isn't performed.
 */
 void sock_flush_strong(intptr_t uuid) {
-  while (sock_flush(uuid) == 0)
+  errno = 0;
+  while (sock_flush(uuid) == 0 && !errno)
     ;
 }
 /**

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack