oni 4.2.2 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23d90e32e433203a63413d211532265e4ff02e550298d324521f77cc3295ef7
-  data.tar.gz: 04f1e134b4d31efd0d79191ba37c9c8d63a33ea056edffc4cfbafffaa0268375
+  metadata.gz: 40eeae757bf8695a6f2ed1256ad7bdb670eb4e303f84519f55fcfa4958b8e948
+  data.tar.gz: 1152004d002543f7a5e838e6da6eba80cc92469b84b24916217071f42c40d0e4
 SHA512:
-  metadata.gz: 7b50421bc3a740682a3d0889c8dcf0ddc616bdf1dac8b1e32d9aeef7c4469c156785bd995d071b5457750f0b9b98f4b27b927b043113b45c1f998816865a782a
-  data.tar.gz: 9076cf44c34dd26a2377631fb42daae148b7d0507970a1ec8b7921052f101dcc4b8119c4c474a6f2bb2c16cf8962ff2d1b08cf0ced05b8bfbfe35bb76f6a57ef
+  metadata.gz: d242b9d34545a45d799a8fc244ea20060e76dc0dacaf972041a537ff8e3747ebeffd0be9df82ef894ece79e99f2a4bb9c2315314097d0d0310e0318ab51dc2df
+  data.tar.gz: 108854de0df628b2623b96f4cc4e6696f6eb4b14e0302e56d6e1ba237145cc788636d240171e3a0c85e21a9d9195502bc34fcf04fb44fe55784c378a9daac3ad

data/lib/oni/daemon.rb

@@ -41,7 +41,7 @@ module Oni
     # is defined.
     #
     def initialize
-      @daemon_workers = {}
+      @daemon_workers = Hash.new{ |h, k| h[k] = [] }
 
       after_initialize if respond_to?(:after_initialize)
     end
@@ -56,16 +56,15 @@ module Oni
     def start
       before_start if respond_to? :before_start
 
-      return run_thread   if threads <= 1
-      return spawn_worker if workers <= 1
-
-      Array.new workers do |i|
-        Thread.new do
-          Process.wait fork{ spawn_worker i+1 } while true
-        end
-      end.each(&:join)
+      wthreads = if threads <= 1    then [run_thread]
+                 elsif workers <= 1 then standard_worker
+                 else wthreads = Array.new(workers){ |i| spawn_worker i } end
 
       after_start if respond_to? :after_start
+
+      %i[INT TERM].each{ |sig| trap(sig){ stop } }
+      wthreads.each(&:join) if workers > 1
+
     rescue => error
       error(error)
     end
@@ -80,6 +79,7 @@ module Oni
         worker_threads.each(&:kill)
         worker_threads.clear
       end
+      exit
     end
 
     def workers
@@ -185,11 +185,25 @@ module Oni
     #
     # @return [Thread]
     #
-    def spawn_worker i = nil
-      Process.setproctitle "#{$0}: worker #{i}" if i
+    def spawn_worker name = nil, &block
+      Thread.new do
+        pid = nil
+        loop do # keep restarting for OOM and other cases
+          pid = fork do
+            Process.setproctitle "#{$0}: worker #{name}" if name
+
+            if block then yield else standard_worker end
+          end
+          Process.wait pid
+        end
+      ensure
+        Process.kill :KILL, pid
+      end
+    end
 
-      daemon_workers[Process.pid] = Array.new threads do
-        spawn_thread
+    def standard_worker
+      Array.new(threads) do
+        spawn_thread.tap{ |t| daemon_workers[Process.pid] << t }
       end.each(&:join)
     end
 
@@ -199,11 +213,9 @@ module Oni
     # @return [Thread]
     #
     def spawn_thread
-      thread = Thread.new { run_thread }
-
-      thread.abort_on_exception = true
-
-      return thread
+      Thread.new{ run_thread }.tap do |t|
+        t.abort_on_exception = true
+      end
     end
 
     ##

data/lib/oni/version.rb

@@ -1,3 +1,3 @@
 module Oni
-  VERSION = '4.2.2'
+  VERSION = '4.3.1'
 end # Oni

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.1
 platform: ruby
 authors:
 - Yorick Peterse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake