opener-daemons 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88c5a468c3c59372fdcf6e7871ae9b0b6263f95a
-  data.tar.gz: f94d453906e3617b222c3c03596ff26e3ef1832b
+  metadata.gz: d2eacba33e31086ca9553118a83530bf263e6226
+  data.tar.gz: 76a8a29f7dc9cc33b9d63145b9850f1ff375a913
 SHA512:
-  metadata.gz: 79646a3b36acc015c5be3b055fee3a8ecde940099263e3967d87f4f121648db4b4b5c84fe401075671095c536c8406f08469f103b006491535d50d94263b7f6c
-  data.tar.gz: da90a03f93966aae4197a2bb9186c559f496a66d288df76bbbda65ad407479b5c10076ca37de56eff76d409f13a828b741ca78cd53125d54a969de2a879597c8
+  metadata.gz: 2b7c6c7fd270e39ec41311378948dc085f9051c29044156a1b0ccc004e88b0ed56e2f0e87728427cba1a9a546b6303e7200687716286aae87a16063fa2de8380
+  data.tar.gz: c5153594d5c10b19c1c517919c4e8a275d72f3395b49406ea287c5fdb152efe03ecef8bcf58cf0d7d09c3ee3140891a286506d6efd758d48a6638ca72fa6f88b

data/lib/opener/daemons/daemon.rb

@@ -17,13 +17,13 @@ module Opener
         @output_queue = Opener::Daemons::SQS.find(options.fetch(:output_queue))
 
         @threads = {}
-        @threads[:writers] = []
         @threads[:readers] = []
         @threads[:workers] = []
+        @threads[:writers] = []
 
         @thread_counts = {}
-        @thread_counts[:workers] = options.fetch(:workers, 1)
-        @thread_counts[:readers] = options.fetch(:readers, 5)
+        @thread_counts[:readers] = options.fetch(:readers, 1)
+        @thread_counts[:workers] = options.fetch(:workers, 5)
         @thread_counts[:writers] = options.fetch(:writers, 1)
 
         @batch_size = options.fetch(:batch_size, 10)
@@ -40,6 +40,7 @@ module Opener
                         else
                           Logger::INFO
                         end
+
       end
 
       def buffer_new_messages
@@ -117,13 +118,21 @@ module Opener
         reporter = Thread.new do
           loop do
             logger.debug "input buffer: #{input_buffer.size} \t output buffer: #{output_buffer.size}"
+
+            thread_types = [:readers, :workers, :writers]
+            thread_counts = thread_types.map do |type|
+              threads[type].select{|thread| thread.status}.count
+            end
+            zip = thread_types.zip(thread_counts)
+            logger.debug "active thread counts: #{zip}"
+
             sleep(2)
           end
         end
 
-        threads[:writers].each(&:join)
         threads[:readers].each(&:join)
         threads[:workers].each(&:join)
+        threads[:writers].each(&:join)
       end
 
       def buffer_size

data/lib/opener/daemons/opt_parser.rb

@@ -3,17 +3,37 @@ require 'optparse'
 module Opener
   module Daemons
     class OptParser
+      attr_accessor :option_parser, :options
+
+      def initialize(&block)
+        @options = {}
+        @option_parser = construct_option_parser(options, &block)
+      end
+
+      def parse(args)
+        process(:parse, args)
+      end
+
+      def parse!(args)
+        process(:parse!, args)
+      end
 
       def self.parse(args)
-        process(args, :parse)
+        new.parse(args)
       end
 
       def self.parse!(args)
-        process(args, :parse!)
+        new.parse!(args)
       end
 
-      def self.process(args, call)
-        options = {}
+      private
+
+      def process(call, args)
+        option_parser.send(call, args)
+        return options
+      end
+
+      def construct_option_parser(options, &block)
         script_name = File.basename($0, ".rb")
 
         OptionParser.new do |opts|
@@ -21,7 +41,15 @@ module Opener
           opts.separator ""
           opts.separator "When calling #{script_name} without <start|stop|restart> the daemon will start as a foreground process"
           opts.separator ""
-          opts.separator "Specific options:"
+
+          if block_given?
+            opts.separator "Component Specific options:"
+            opts.separator ""
+            yield opts, options
+            opts.separator ""
+          end
+
+          opts.separator "Daemon options:"
 
           opts.on("-i", "--input INPUT_QUEUE_NAME", "Input queue name") do |v|
             options[:input_queue] = v
@@ -73,9 +101,7 @@ module Opener
             puts opts
             exit
           end
-        end.send(call, args)
-
-        return options
+        end
       end
     end
   end

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/opener-daemons.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Wilco van Duinkerken
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -66,6 +66,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: Daemonize OpeNER components and make them read from an SQS queue. JRuby compatible.
 email:
 - wilco@sparkboxx.com