opal-up 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46fd760653d3303f32429a4dfd767c4d93ac56817393785d7da35632ab2d4ad2
-  data.tar.gz: a809d96c97f31441dd51c8e5c87aeaee47059835718f62de3217b38348d7d111
+  metadata.gz: cb3a4f16540780758e686bbd53c9ab5467b85988bd83a990b05ab54b124c2d2d
+  data.tar.gz: 292c74cb7b0771cf807af2b1ebc221707f2b92bd28ca2e1271038b242aa94fc5
 SHA512:
-  metadata.gz: 6cd09583959a4340bafda2c118a570df793884fc2813e2b93a251f26220e243910263093c3ff24ac8f9dcc337af5cf1c152f5c9a491e58a5dcc32d035ef5c545
-  data.tar.gz: 7e45708e9f770ea45dd463dd5bf39075d7d241fe73d0ea60d638e6d80369dec4ae16661b9187525b522440133fa0272df62ca1c982bb132737807c9e05dae6f3
+  metadata.gz: 4fbbd939aa7c268d503953c9d7b36d92071c23ae498df1c948acb6886007a66eb60218766528fbb6f5fe1016cdd77890a039533c40fbe3baad8594cca77f8e2d
+  data.tar.gz: da01a9584cd43ec5d5c2b97cad04c2bf6895ec029e5e34f4614a9381010788009c97f09c5b8e832913befbb6fb2b3b9157f1baeeff280cbd3e527bb61b4450e6

data/ext/up_ext/up_ext.c

@@ -26,6 +26,7 @@ static ID at_instance;
 static ID at_member_id;
 static ID at_members;
 static ID at_open;
+static ID at_port;
 static ID at_protocol;
 static ID at_secret;
 static ID at_server;
@@ -629,6 +630,8 @@ static VALUE up_server_init(int argc, VALUE *argv, VALUE self) {
   s->port = rport;
   s->logger = rargs[3];
 
+  rb_ivar_set(self, at_port, s->port);
+
   return self;
 }
 
@@ -969,6 +972,7 @@ void Init_up_ext(void) {
   at_member_id = rb_intern("@member_id");
   at_members = rb_intern("@members");
   at_open = rb_intern("@open");
+  at_port = rb_intern("@port");
   at_protocol = rb_intern("@protocol");
   at_secret = rb_intern("@secret");
   at_server = rb_intern("@server");

data/lib/up/ruby/cluster.rb

@@ -1,6 +1,7 @@
 # backtick_javascript: true
 require 'etc'
 require 'random/formatter'
+require 'socket'
 require 'up_ext'
 
 module Up
@@ -38,8 +39,10 @@ module Up
 
       def install_signal_handlers
         Signal.trap('CHLD') do
-          warn "\nError: a cluster member died!"
-          kill_members
+          unless members_alive?
+            warn "\nError: a cluster worker died!"
+            kill_members
+          end
         end
         Signal.trap('INT') do
           warn "\nReceived CTRL-C!"
@@ -49,7 +52,7 @@ module Up
 
       def kill_members
         Signal.trap('CHLD', 'IGNORE')
-        STDERR.print "Stopping workers: "
+        STDERR.print "Stopping all workers: "
         @members.each do |mid|
           Process.kill('INT', mid) rescue nil
           STDERR.print '.'
@@ -58,6 +61,15 @@ module Up
         warn "\nCluster stopped."
         Signal.trap('CHLD', 'DEFAULT')
       end
+
+      def members_alive?
+        @workers.times do |i|
+          TCPSocket.new('localhost', @port + i + 1).close
+        end
+        true
+      rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
+        false
+      end
     end
   end
 end

data/lib/up/version.rb

@@ -1,3 +1,3 @@
 module Up
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-up
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jan Biedermann