iudex-worker 1.3.0-java → 1.3.1-java

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 1.3.1 (2012-10-25)
+* Improve shutdown reliability by adding Agent.run_safe with ensure'd
+  close calls.
+
 === 1.3.0 (2012-10-4)
 * Expand to iudex-core, -da, -rome, -html, -simhash [1.2.1,1.4)
 

data/init/iudex-worker

@@ -24,7 +24,7 @@
 
 require 'rubygems'
 
-gem( "iudex-worker", "= 1.3.0" )
+gem( "iudex-worker", "= 1.3.1" )
 
 module IudexInitScript
 

data/lib/iudex-worker/agent.rb

@@ -86,45 +86,48 @@ module Iudex
 
       def run
         Hooker.with( :iudex ) do
-          dsf = PoolDataSourceFactory.new
-          data_source = dsf.create
+          run_safe
+        end
+      end
 
-          wpoller = work_poller( data_source )
-          vexec = visit_manager( wpoller )
-          vexec.start_executor
+      def run_safe
+        dsf = PoolDataSourceFactory.new
+        data_source = dsf.create
 
-          hclient = http_client( vexec.executor )
+        wpoller = work_poller( data_source )
+        vexec = visit_manager( wpoller )
+        vexec.start_executor
 
-          fcf = filter_chain_factory
-          fcf.http_client = hclient
-          fcf.data_source = data_source
-          fcf.visit_counter = vexec
+        hclient = http_client( vexec.executor )
 
-          # FilterChain's executor is the same executor, unless using
-          # HTTPClient3, where executor is best not used
-          fcf.executor = vexec.executor unless @http_manager
+        fcf = filter_chain_factory
+        fcf.http_client = hclient
+        fcf.data_source = data_source
+        fcf.visit_counter = vexec
 
-          Hooker.apply( :filter_factory, fcf )
+        # FilterChain's executor is the same executor, unless using
+        # HTTPClient3, where executor is best not used
+        fcf.executor = vexec.executor unless @http_manager
 
-          fcf.filter do |chain|
-            vexec.filter_chain = chain
+        Hooker.apply( [ :iudex, :filter_factory ], fcf )
 
-            Hooker.log_not_applied # All hooks should be used by now
+        fcf.filter do |chain|
+          vexec.filter_chain = chain
 
-            vexec.start
-            vexec.join    #Run until interrupted
-          end # fcf closes
+          Hooker.log_not_applied # All hooks should be used by now
 
-          hclient.close if hclient.respond_to?( :close )
-          @http_manager.shutdown if @http_manager
+          vexec.start
+          vexec.join # Run until interrupted
+        end # fcf closes
 
-          dsf.close
-        end
       rescue => e
         @log.error( "On run: ", e )
+      ensure
+        hclient.close if hclient && hclient.respond_to?( :close )
+        @http_manager.shutdown if @http_manager
+        dsf.close if dsf
       end
 
     end
-
   end
 end

data/lib/iudex-worker/base.rb

@@ -16,6 +16,6 @@
 
 module Iudex
   module Worker
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/test/test_agent.rb

@@ -69,6 +69,19 @@ class TestAgent < MiniTest::Unit::TestCase
     Iudex.send( :remove_const, :AsyncHTTPClient )
   end
 
+  def test_agent_graceful_shutdown_on_fcf_error
+    Hooker.add( [ :iudex, :filter_factory ] ) do |fcf|
+      def fcf.filters
+        super
+        raise "Test Badness in FCF"
+      end
+    end
+
+    agent = Agent.new
+    agent.run
+    pass # returns
+  end
+
   def assert_agent
 
     # Stub VisitManager.start to allow agent.run to return early.

metadata

@@ -2,14 +2,14 @@
 name: iudex-worker
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.3.0
+  version: 1.3.1
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iudex-core