oni 4.1.2 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 778857ec8997102b397020f4a79c2eca7e4c9e80
-  data.tar.gz: 0da85c03874b6cc14fb7fe94d948022e3a2104b0
+SHA256:
+  metadata.gz: d23d90e32e433203a63413d211532265e4ff02e550298d324521f77cc3295ef7
+  data.tar.gz: 04f1e134b4d31efd0d79191ba37c9c8d63a33ea056edffc4cfbafffaa0268375
 SHA512:
-  metadata.gz: d49cd26b892b851e5a1ba770d11978780632723fab878146cd9686c703585c76cb3576e4d61e096b9f275f8db1975eec65abc0198382b80d0f4e28cd36afa31c
-  data.tar.gz: 516665bc4b5d18b0a483ba71a18692a3645e297e9f269189fdd25e64ce88b1bf44358ca3f36870fcd35b19158bb7c1b7c04e8749726374ef0f0705c6a838176e
+  metadata.gz: 7b50421bc3a740682a3d0889c8dcf0ddc616bdf1dac8b1e32d9aeef7c4469c156785bd995d071b5457750f0b9b98f4b27b927b043113b45c1f998816865a782a
+  data.tar.gz: 9076cf44c34dd26a2377631fb42daae148b7d0507970a1ec8b7921052f101dcc4b8119c4c474a6f2bb2c16cf8962ff2d1b08cf0ced05b8bfbfe35bb76f6a57ef

data/lib/oni/configurable.rb

@@ -38,12 +38,9 @@ module Oni
     #
     def option(name, default = nil)
       value = self.class.options[name.to_sym]
+      value = default if default and !value
 
-      if default and !value
-        value = default
-      end
-
-      return value.respond_to?(:call) ? value.call : value
+      if value.respond_to? :call then value.call else value end
     end
 
     ##
@@ -102,6 +99,7 @@ module Oni
           set(option, value)
         end
       end
-    end # ClassMethods
-  end # Configurable
-end # Oni
+
+    end
+  end
+end

data/lib/oni/daemon.rb

@@ -13,7 +13,14 @@ module Oni
   class Daemon
     include Configurable
 
-    attr_reader :workers
+    attr_reader :daemon_workers
+
+    ##
+    # The default amount of worker to start.
+    #
+    # @return [Fixnum]
+    #
+    DEFAULT_WORKER_AMOUNT = 1
 
     ##
     # The default amount of threads to start.
@@ -34,7 +41,7 @@ module Oni
     # is defined.
     #
     def initialize
-      @workers = []
+      @daemon_workers = {}
 
       after_initialize if respond_to?(:after_initialize)
     end
@@ -47,19 +54,18 @@ module Oni
     # before starting the daemon.
     #
     def start
-      before_start if respond_to?(:before_start)
+      before_start if respond_to? :before_start
 
-      if threads > 0
-        threads.times do
-          workers << spawn_thread
-        end
+      return run_thread   if threads <= 1
+      return spawn_worker if workers <= 1
 
-        workers.each(&:join)
+      Array.new workers do |i|
+        Thread.new do
+          Process.wait fork{ spawn_worker i+1 } while true
+        end
+      end.each(&:join)
 
-      # If we don't have any threads run in non threaded mode.
-      else
-        run_thread
-      end
+      after_start if respond_to? :after_start
     rescue => error
       error(error)
     end
@@ -70,8 +76,14 @@ module Oni
     # be shut down *immediately*.
     #
     def stop
-      workers.each(&:kill)
-      workers.clear
+      daemon_workers.each do |pid, worker_threads|
+        worker_threads.each(&:kill)
+        worker_threads.clear
+      end
+    end
+
+    def workers
+      option :workers, DEFAULT_WORKER_AMOUNT
     end
 
     ##
@@ -80,7 +92,7 @@ module Oni
     # @return [Fixnum]
     #
     def threads
-      return option(:threads, DEFAULT_THREAD_AMOUNT)
+      option :threads, DEFAULT_THREAD_AMOUNT
     end
 
     ##
@@ -168,6 +180,19 @@ module Oni
       return option(:mapper).new
     end
 
+    ##
+    # Spawns a new thread that waits for daemon input.
+    #
+    # @return [Thread]
+    #
+    def spawn_worker i = nil
+      Process.setproctitle "#{$0}: worker #{i}" if i
+
+      daemon_workers[Process.pid] = Array.new threads do
+        spawn_thread
+      end.each(&:join)
+    end
+
     ##
     # Spawns a new thread that waits for daemon input.
     #
@@ -198,5 +223,6 @@ module Oni
 
       retry
     end
-  end # Daemon
-end # Oni
+
+  end
+end

data/lib/oni/daemons/sqs.rb

@@ -71,6 +71,7 @@ module Oni
 
         return response.queue_url
       end
-    end # SQS
-  end # Daemons
-end # Oni
+
+    end
+  end
+end

data/lib/oni/version.rb

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

data/oni.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
 
   gem.summary     = 'Framework for building concurrent daemons in Ruby.'
   gem.description = gem.summary
-  gem.has_rdoc    = 'yard'
   gem.license     = 'MIT'
 
   gem.required_ruby_version = '>= 1.9.3'
@@ -30,5 +29,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'kramdown'
+  gem.add_development_dependency 'pry'
   gem.add_development_dependency 'aws-sdk', '~> 2.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.2
 platform: ruby
 authors:
 - Yorick Peterse
 - Wilco van Duinkerken
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Framework for building concurrent daemons in Ruby.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -129,11 +143,11 @@ files:
 - lib/oni/worker.rb
 - lib/oni/wrapped_error.rb
 - oni.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Framework for building concurrent daemons in Ruby.
 test_files: []