oni 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e86f0fc6b0d6056128511d7a55a0d6be22b4830a
-  data.tar.gz: 67bb84f5831cfcaa771103bfa81e5bc96c052054
+SHA256:
+  metadata.gz: 416abd59b70ff8bd2f2a98b03afc9c714ada232b409036ff973455091954c4aa
+  data.tar.gz: e4b779b2255b95f396ca3d66e82b4f9b3766a9768ad00949a2fad3446026dba5
 SHA512:
-  metadata.gz: 3da0297aec49385fe97d280906ef75dc89f24e0c571baab7ebc3dde484e13ea31e47f0b7dd80928dfd5da8b0d4adab10d3a8aa33b30daa63e5872f38dfac6b7c
-  data.tar.gz: ca0126f07de0d95b51e5abc149435450c573672352b7525b2acabbba010d812fa17e83736828bf98706515d40b568e21b1c5c66d4e908425c77a23203214199a
+  metadata.gz: cf9380fae049e874030a9909977328806203578ed5aa72331ea343e8c081b139d36527b5aba921a8e261865c247a018ecbc97004ff7f497dc2b0d99f4385b1b0
+  data.tar.gz: 60267682fe360ecd126f352ab26946c5413f18bf36e2059fe7751a65ea8c987451dfeda92982a22e89ca5512d3f6ab9b38dacd81f1782d44ba48f0173d78ac1f

data/doc/changelog.md

@@ -1,6 +1,11 @@
 # @title Changelog
 # Changelog
 
+## 4.0.0 - April 24th, 2015
+
+Oni now depends on V2 of the AWS SDK and no longer sends any benchmarking
+details to `Daemon#complete`.
+
 ## 3.1.1 - February 20th, 2015
 
 Oni now depends on version 1 of the AWS SDK (`aws-sdk-v1`) due to the `aws-sdk`

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.
@@ -22,12 +29,19 @@ module Oni
     #
     DEFAULT_THREAD_AMOUNT = 5
 
+    ##
+    # The default amount of threads to start.
+    #
+    # @return [Fixnum]
+    #
+    DEFAULT_WORKER_TIMEOUT = nil
+
     ##
     # Creates a new instance of the class and calls `#after_initialize` if it
     # is defined.
     #
     def initialize
-      @workers = []
+      @daemon_workers = {}
 
       after_initialize if respond_to?(:after_initialize)
     end
@@ -42,14 +56,14 @@ module Oni
     def start
       before_start if respond_to?(:before_start)
 
-      # If we don't have any threads run in non threaded mode.
       if threads > 0
-        threads.times do
-          workers << spawn_thread
+        if workers > 1
+          workers.times{ |i| fork{ spawn_worker i } }
+          Process.waitall
+        else
+          spawn_worker
         end
-
-        workers.each(&:join)
-      else
+      else # If we don't have any threads run in non threaded mode.
         run_thread
       end
     rescue => error
@@ -62,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
 
     ##
@@ -72,7 +92,16 @@ module Oni
     # @return [Fixnum]
     #
     def threads
-      return option(:threads, DEFAULT_THREAD_AMOUNT)
+      option :threads, DEFAULT_THREAD_AMOUNT
+    end
+
+    ##
+    # Returns the amount of threads to use.
+    #
+    # @return [Fixnum]
+    #
+    def worker_timeout
+      option :worker_timeout, DEFAULT_WORKER_TIMEOUT
     end
 
     ##
@@ -98,9 +127,11 @@ module Oni
       mapper = create_mapper
       input  = mapper.map_input(message)
       worker = option(:worker).new(*input)
-      output = worker.process
+      output = Timeout.timeout worker_timeout do
+        worker.process
+      end
 
-      return mapper.map_output(output)
+      mapper.map_output output
     end
 
     ##
@@ -149,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.
     #
@@ -171,11 +215,14 @@ module Oni
     # (and fail hard) or if it should continue running.
     #
     def run_thread
-      receive { |message| process(message) }
+      receive do |message|
+        process message
+      end
     rescue => error
       error(error)
 
       retry
     end
-  end # Daemon
-end # Oni
+
+  end
+end

data/lib/oni/daemons/sqs.rb

@@ -20,6 +20,7 @@ module Oni
     #   information on the available options.
     #
     class SQS < Daemon
+
       ##
       # Checks if the `queue_name` option is set.
       #
@@ -31,8 +32,14 @@ module Oni
       # Polls an SQS queue for a message and processes it.
       #
       def receive
-        queue.poll(poll_options) do |message|
-          yield message
+        poll_options.merge! max_number_of_messages: 10
+
+        queue.poll poll_options do |messages|
+          next yield messages unless messages.is_a? Array
+
+          messages.each do |message|
+            yield message
+          end
         end
       end
 
@@ -64,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.0.0'
+  VERSION = '4.2.0'
 end # Oni

data/lib/oni.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'timeout'
 
 require_relative 'oni/version'
 require_relative 'oni/configurable'

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.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Yorick Peterse
 - Wilco van Duinkerken
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2021-12-20 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,10 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Framework for building concurrent daemons in Ruby.
 test_files: []
-has_rdoc: yard