oni 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d78db0264593a2aea45885eed49c3cf655379b730708ffb9d0d3449f0738fe
-  data.tar.gz: d4f9a83030eccd4cdfd786605c1c982f997ad037c922301fecf747915434adda
+  metadata.gz: 40eeae757bf8695a6f2ed1256ad7bdb670eb4e303f84519f55fcfa4958b8e948
+  data.tar.gz: 1152004d002543f7a5e838e6da6eba80cc92469b84b24916217071f42c40d0e4
 SHA512:
-  metadata.gz: f9de57477ff466dca18c6e8e20fb6395e56a4d3dbbecd42d39aa64299e04c88fb8367e02d319ab7143a4a2b97da027be173a956c7f0aa98920c5f58b6ed9c982
-  data.tar.gz: e809d85d9615508e2f5e59aa8697e4d7b14727c415178e5b977986db69749561d588614d62d6ad4bfe71ed3494fa5d1df4bee5e336fe169fef334ae21df951e3
+  metadata.gz: d242b9d34545a45d799a8fc244ea20060e76dc0dacaf972041a537ff8e3747ebeffd0be9df82ef894ece79e99f2a4bb9c2315314097d0d0310e0318ab51dc2df
+  data.tar.gz: 108854de0df628b2623b96f4cc4e6696f6eb4b14e0302e56d6e1ba237145cc788636d240171e3a0c85e21a9d9195502bc34fcf04fb44fe55784c378a9daac3ad

data/lib/oni/daemon.rb

@@ -58,7 +58,7 @@ module Oni
 
       wthreads = if threads <= 1    then [run_thread]
                  elsif workers <= 1 then standard_worker
-                 else wthreads = Array.new(workers).map{ |i| spawn_worker i } end
+                 else wthreads = Array.new(workers){ |i| spawn_worker i } end
 
       after_start if respond_to? :after_start
 
@@ -79,6 +79,7 @@ module Oni
         worker_threads.each(&:kill)
         worker_threads.clear
       end
+      exit
     end
 
     def workers
@@ -184,21 +185,24 @@ module Oni
     #
     # @return [Thread]
     #
-    def spawn_worker i = nil, &block
+    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 #{i}" if i
+            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
 
     def standard_worker
-      Array.new(threads).map do
+      Array.new(threads) do
         spawn_thread.tap{ |t| daemon_workers[Process.pid] << t }
       end.each(&:join)
     end

data/lib/oni/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Yorick Peterse