daemonic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1446f7014c74a118db956ede363c6ba0dc31dc6
-  data.tar.gz: e519190127e484ab4ca0722928eaac7feadc9e6f
+  metadata.gz: 02568ce6526b1a6407039c4abb9b45d005bf5e7f
+  data.tar.gz: 388216ee58cdbc4b272f15b76df288ebe65d29c0
 SHA512:
-  metadata.gz: 584c0e7c4fb1cb899743762b553ddcf4bb76169029f41c4db8b89ab456bcb23f18fa8d7688e2d6ea26b45b9ca18de9caf9c14cd1b371365ad4144f7551795ddc
-  data.tar.gz: 76cfeaa9cdb7067afd482b96fe3de73a8e72d9baeb5ba5f775878c09c89fb962d466199b69d294b82b5512c54e6fa6fc5f9d50c89bf5e3800c0a086d0779d126
+  metadata.gz: d4d4bd93c7b5f861f7bc1fb575bb613ee9756a5a285f618821ce4b649592cdf3fd83fec2be636213088eeb19944cfde31c0d3dc738b6dd2665bb0a2b37dec110
+  data.tar.gz: 80879158acec4db8a26fdc654ff8329f410ff92c6b93f0c31a2ed99e09991afdce1ec12d2492c98e8653e915ba2b0a38f955b63bf96f5e716bed449ab641c80d

data/lib/daemonic/pool.rb

@@ -13,11 +13,12 @@ module Daemonic
 
     STOP_SIGNAL = StopSignal.new
 
-    def initialize(thread_count, worker, logger)
-      @worker  = worker
-      @jobs    = SizedQueue.new(thread_count)
-      @logger  = logger
-      @threads = thread_count.times.map {|worker_num|
+    attr_reader :producer
+
+    def initialize(producer)
+      @producer = producer
+      @jobs    = SizedQueue.new(producer.queue_size)
+      @threads = producer.concurrency.times.map {|worker_num|
         Thread.new do
           dispatch(worker_num)
         end
@@ -25,7 +26,7 @@ module Daemonic
     end
 
     def enqueue(job)
-      @logger.debug { "Enqueueing #{job.inspect}" }
+      logger.debug { "Enqueueing #{job.inspect}" }
       @jobs.push(job)
     end
     alias_method :<<, :enqueue
@@ -40,26 +41,38 @@ module Daemonic
     private
 
     def dispatch(worker_num)
-      @logger.debug { "T#{worker_num}: Starting" }
+      logger.debug { "T#{worker_num}: Starting" }
       loop do
         job = @jobs.pop
         if STOP_SIGNAL.equal?(job)
-          @logger.debug { "T#{worker_num}: Received stop signal, terminating." }
+          logger.debug { "T#{worker_num}: Received stop signal, terminating." }
           break
         end
         begin
-          @logger.debug { "T#{worker_num}: Consuming #{job.inspect}" }
-          @worker.consume(job)
+          logger.debug { "T#{worker_num}: Consuming #{job.inspect}" }
+          worker.consume(job)
           Thread.pass
         rescue Object => error
-          @logger.warn { "T#{worker_num}: Error while processing #{job}: #{error.class}: #{error}" }
-          @logger.info { error.backtrace.join("\n") }
+          if error.is_a?(SystemExit) # allow app to exit
+            logger.warn { "T#{worker_num}: Received SystemExit, shutting down" }
+            producer.stop
+          else
+            logger.warn { "T#{worker_num}: #{error.class} while processing #{job}: #{error}" }
+            logger.info { error.backtrace.join("\n") }
+          end
           Thread.pass
         end
       end
-      @logger.debug { "T#{worker_num}: Stopped" }
+      logger.debug { "T#{worker_num}: Stopped" }
+    end
+
+    def worker
+      producer.worker
     end
 
+    def logger
+      producer.logger
+    end
 
   end
 end

data/lib/daemonic/producer.rb

@@ -1,15 +1,15 @@
 module Daemonic
   class Producer
 
-    attr_reader :worker, :queue, :concurrency, :options
+    attr_reader :worker, :concurrency, :options, :queue_size
 
     def initialize(worker, options)
-      @worker = worker
-      @options = options
+      @worker      = worker
+      @options     = options
       @concurrency = options.fetch(:concurrency) { 4 }
-
-      @queue = SizedQueue.new(concurrency) { concurrency + 1 }
-      @running = true
+      @queue_size  = options.fetch(:queue_size) { @concurrency + 1 }
+      @logger      = options[:logger]
+      @running     = true
     end
 
     def run
@@ -18,7 +18,7 @@ module Daemonic
       Signal.trap("INT") { stop }
       Signal.trap("TERM") { stop }
 
-      pool = Pool.new(concurrency, worker, logger)
+      pool = Pool.new(self)
 
       producer = Thread.new do
         while @running

data/lib/daemonic/version.rb

@@ -1,3 +1,3 @@
 module Daemonic
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler