oni 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430375f85e0f8d617f53487863c6a4752680fd1d8b5a67cc78529d757e5b5389
-  data.tar.gz: c26f8f5b3457c28145c3e689b6490026dd073b9ea4a5acea06ab9f198d405397
+  metadata.gz: 19d78db0264593a2aea45885eed49c3cf655379b730708ffb9d0d3449f0738fe
+  data.tar.gz: d4f9a83030eccd4cdfd786605c1c982f997ad037c922301fecf747915434adda
 SHA512:
-  metadata.gz: 38ef45f00263093e39de7f38051ad170c48f9578907230d2c1ddd98542bc9c1bc012322e17317e9ceac32ea5d07be8e7ffbabc3f6a62cb9d5f995f6f1ca8449e
-  data.tar.gz: 6799c07046351f56671e1863677e626021dc724196b94404b42f6dc7e8df64c3784ff77a864f7af7b2f2951ed7432e8dedee1a60a9a7fd4c9308ec14c728a7eb
+  metadata.gz: f9de57477ff466dca18c6e8e20fb6395e56a4d3dbbecd42d39aa64299e04c88fb8367e02d319ab7143a4a2b97da027be173a956c7f0aa98920c5f58b6ed9c982
+  data.tar.gz: e809d85d9615508e2f5e59aa8697e4d7b14727c415178e5b977986db69749561d588614d62d6ad4bfe71ed3494fa5d1df4bee5e336fe169fef334ae21df951e3

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,19 +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
+      wthreads = if threads <= 1    then [run_thread]
+                 elsif workers <= 1 then standard_worker
+                 else wthreads = Array.new(workers).map{ |i| spawn_worker i } end
 
-      threads = Array.new workers do |i|
-        Thread.new do
-          Process.wait fork{ spawn_worker i+1 } while true
-        end
-      end
-
-      sleep 3
       after_start if respond_to? :after_start
 
-      threads.each(&:join)
+      %i[INT TERM].each{ |sig| trap(sig){ stop } }
+      wthreads.each(&:join) if workers > 1
+
     rescue => error
       error(error)
     end
@@ -188,11 +184,22 @@ module Oni
     #
     # @return [Thread]
     #
-    def spawn_worker i = nil
-      Process.setproctitle "#{$0}: worker #{i}" if i
+    def spawn_worker i = nil, &block
+      Thread.new do
+        loop do # keep restarting for OOM and other cases
+          pid = fork do
+            Process.setproctitle "#{$0}: worker #{i}" if i
 
-      daemon_workers[Process.pid] = Array.new threads do
-        spawn_thread
+            if block then yield else standard_worker end
+          end
+          Process.wait pid
+        end
+      end
+    end
+
+    def standard_worker
+      Array.new(threads).map do
+        spawn_thread.tap{ |t| daemon_workers[Process.pid] << t }
       end.each(&:join)
     end
 
@@ -202,11 +209,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.3'
+  VERSION = '4.3.0'
 end # Oni

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 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