riser 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ae7fbe0d87eb7546bcd3df41adb101c0c66bb964e07de7d3658cf63d397562
-  data.tar.gz: 288ab38bbd42a41f31a399f12289adf4cdc8ad700ac649a09fea2ec593a2b4f3
+  metadata.gz: 0c9d1d7238c0a2002a16d53c594c40a8f63f8cd29548bd376b59acf280305960
+  data.tar.gz: 3db48c1fffc46fa46af97b479a10737c65c7dcc27690dd7eca85e66897bdd86d
 SHA512:
-  metadata.gz: 98f72efdfda6c5eee8e7adcb0b3a0d5d6ceca0df6f73b1bd544b3eae535f62e671b76a29074bd60c9992943852e89d294e02b38788496e97bf0f66c276462dd4
-  data.tar.gz: e8f52a3f99f42d6bb4e7c05a260165a82d4712669490f9717c95e87639af9551c3aa0288102a813a212897d0f6f8b83465255d0eebdda89f69ead6d7e7757795
+  metadata.gz: 7dfeae8c5c37eff1716fee819db62b642d2da12ee692c564e5813085fe8f98b87ad65fed3b041df7e573c43de2154b2cadc9401259d0739ee56c05a6a1ea3780
+  data.tar.gz: e0aeff5527e15469ea7eecfa84d5848a3ad2716a5e30a58b1153790e822e1c5f096d69826aee7c725ecf94221801ca61be989bc9c0c1b39b30ea62e79392b6e2

data/lib/riser/server.rb

@@ -218,6 +218,7 @@ module Riser
       @accept = nil
       @accept_return = nil
       @dispatch = nil
+      @dispose = nil
       @stop_state = nil
       @stat_operation_queue = []
     end
@@ -271,6 +272,11 @@ module Riser
       nil
     end
 
+    def dispose(&block)         # :yields:
+      @dispose = block
+      nil
+    end
+
     # should be called from signal(2) handler
     def signal_stop_graceful
       @stop_state ||= :graceful
@@ -279,7 +285,9 @@ module Riser
 
     # should be called from signal(2) handler
     def signal_stop_forced
-      @stop_state ||= :forced
+      if (! @stop_state || @stop_state == :graceful) then
+        @stop_state = :forced
+      end
       nil
     end
 
@@ -339,12 +347,16 @@ module Riser
             thread_list << Thread.start(i) {|thread_number|
               begin
                 Thread.current[:number] = thread_number
-                while (socket = queue.pop)
-                  begin
-                    @dispatch.call(socket)
-                  ensure
-                    socket.close unless socket.closed?
+                begin
+                  while (socket = queue.pop)
+                    begin
+                      @dispatch.call(socket)
+                    ensure
+                      socket.close unless socket.closed?
+                    end
                   end
+                ensure
+                  @dispose.call
                 end
               rescue
                 error_lock.synchronize{
@@ -379,19 +391,31 @@ module Riser
           queue.close
         end
 
-        @at_stop.call(@stop_state)
-        case (@stop_state)
-        when :graceful
-          for thread in thread_list
-            thread.join
-          end
-        when :forced
-          for thread in thread_list
-            thread.kill
-          end
-        else
-          raise "internal error: unknown stop state <#{@stop_state.inspect}>"
-        end
+        begin
+          done = catch(:retry_stopping) {
+            @at_stop.call(@stop_state)
+            case (@stop_state)
+            when :graceful
+              until (thread_list.empty?)
+                until (thread_list[0].join(@thread_queue_polling_timeout_seconds))
+                  if (@stop_state == :forced) then
+                    throw(:retry_stopping)
+                  end
+                end
+                thread_list.shift
+              end
+            when :forced
+              until (thread_list.empty?)
+                thread_list[0].kill
+                thread_list.shift
+              end
+            else
+              raise "internal error: unknown stop state <#{@stop_state.inspect}>"
+            end
+
+            true
+          }
+        end until (done)
       ensure
         @postprocess.call
       end
@@ -553,6 +577,7 @@ module Riser
           }
           thread_dispatcher.accept_return{ child_io.write(RADY_CMD) }
           thread_dispatcher.dispatch(&@dispatch)
+          thread_dispatcher.dispose(&NO_CALL)
 
           Signal.trap(SIGNAL_STOP_GRACEFUL) { thread_dispatcher.signal_stop_graceful }
           Signal.trap(SIGNAL_STOP_FORCED) { thread_dispatcher.signal_stop_forced }
@@ -627,12 +652,12 @@ module Riser
         response = process.io.read(RADY_LEN)
         response == RADY_CMD or raise "internal error: unknown response <#{response.inspect}>"
       }
-      @process_dispatcher.start
-
-      for process in process_list
+      @process_dispatcher.dispose{
+        process = process_list[Thread.current[:number]]
         Process.wait(process.pid)
         process.io.close
-      end
+      }
+      @process_dispatcher.start
 
       nil
     end
@@ -772,6 +797,7 @@ module Riser
         }
         @dispatcher.accept_return(&NO_CALL)
         @dispatcher.dispatch(&@dispatch)
+        @dispatcher.dispose(&NO_CALL)
       end
 
       nil

data/lib/riser/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module Riser
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end
 
 # Local Variables:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler