carnivore 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc8864e595d0a5dd8fa8b5d530fb6db2a238847
-  data.tar.gz: c0c182a518b96ec871b3bcc77e25a25fbf4af3a2
+  metadata.gz: aedba5959fa082d4f04f6bb5165ea378cee944ec
+  data.tar.gz: 7bd2695bd45dc6082ab6e0d0945282bf7ddd63c0
 SHA512:
-  metadata.gz: 31f15a9533f22d14ca5c986dc74007bde2cc7fbc39c73cff382ee10e6ad6774d81b2772205c28cea4861e27896a6e2dc0b8ea95fefba41ce07c7757ea1a02f7f
-  data.tar.gz: 29657c45ce66b925fe0d6ee5da1ba59ba7c1165c04cd38bcaf08a12c00dc20c23a12dad23db0a4d3a0ce5068ec58fc566a41ca4251c03f7a890cca9d7a97fdb6
+  metadata.gz: 80577dc5d1759a53abef37c029a0232a15925194778269c860044ae06c746a25b24042fe5c60cff267e799716c5bc3799f60d22f75070581df7b8d35965e3722
+  data.tar.gz: 46726d66aa89017f074909e25d2ff5ff048c49417252cf23fa9bd4014a512243ae5d84e5184328db3e5ca056b94b856ae2917d84e3c47c212263a7c8a68fb2ce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v1.0.6
+* Add forcible shutdown support after timeout
+* Fix supervisor return value to provide subclassed implementation
+
 # v1.0.4
 * Update async requests to be locked requests
 * Adjust minimum constraint on zoidberg dependency

data/lib/carnivore/runner.rb

@@ -1,6 +1,10 @@
 require 'carnivore'
 
 module Carnivore
+
+  # Number of seconds to wait for clean shutdown
+  FORCE_SHUTDOWN_AFTER = 8
+
   class << self
 
     # Sets the global configuration
@@ -96,9 +100,20 @@ module Carnivore
       rescue Exception => e
         Carnivore::Logger.warn "Exception type encountered forcing shutdown - #{e.class}: #{e}"
         Carnivore::Logger.debug "Shutdown exception info: #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+        Zoidberg.signal_shutdown = true
         supervisor.terminate if supervisor
+        Carnivore::Logger.debug 'Carnivore supervisor has been teminated!'
+        timeout = Carnivore::FORCE_SHUTDOWN_AFTER
+        until(timeout <= 0 || Thread.list.size == 1)
+          timeout -= 0.1
+          sleep(0.1)
+        end
+        Thread.list.each do |thread|
+          next if Thread.current == thread
+          Carnivore::Logger.warn "Force killing live thread for shutdown: #{thread.inspect}"
+          thread.kill
+        end
         raise
-        # Gracefully shut down
       end
     end
   end

data/lib/carnivore/supervisor.rb

@@ -15,9 +15,9 @@ module Carnivore
 
       # Create a new supervisor
       #
-      # @return [Array<[Celluloid::Registry, Carnivore::Supervisor]>]
+      # @return [Array<[Zoidberg::Registry, Carnivore::Supervisor]>]
       def create!
-        s = Zoidberg::Supervisor.new
+        s = Carnivore::Supervisor.new
         [s.registry, s]
       end
 
@@ -29,6 +29,9 @@ module Carnivore
         if(sup)
           @supervisor = sup
         end
+        unless(@supervisor)
+          raise Zoidberg::DeadException.new('Instance in terminated state!')
+        end
         @supervisor
       end
 

data/lib/carnivore/version.rb

@@ -1,4 +1,4 @@
 module Carnivore
   # Current version of library
-  VERSION = Gem::Version.new('1.0.4')
+  VERSION = Gem::Version.new('1.0.6')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-config